diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 11:04:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 11:04:17 +1000 |
| commit | e8583bb2d35e8b0fc53cd389453a50d21aecc31d (patch) | |
| tree | a7807717bf25729b3b488173f8558904e64aa647 /include | |
| parent | cf704ed40dfe863749d3952ab6834a1825125027 (diff) | |
| parent | d61771dbb960d791cbf2080099ab8d0d78b4d4fb (diff) | |
Merge branch 'quilt/driver-core.current'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index ed4e39f2c423..375e020651f7 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -2,7 +2,8 @@ * device.h - generic, centralized driver model * * Copyright (c) 2001-2003 Patrick Mochel <mochel@osdl.org> - * Copyright (c) 2004-2007 Greg Kroah-Hartman <gregkh@suse.de> + * Copyright (c) 2004-2009 Greg Kroah-Hartman <gregkh@suse.de> + * Copyright (c) 2008-2009 Novell Inc. * * This file is released under the GPLv2 * @@ -382,7 +383,6 @@ struct device { struct bus_type *bus; /* type of bus device is on */ struct device_driver *driver; /* which driver has allocated this device */ - void *driver_data; /* data private to the driver */ void *platform_data; /* Platform specific data, device core doesn't touch it */ struct dev_pm_info power; @@ -448,16 +448,6 @@ static inline void set_dev_node(struct device *dev, int node) } #endif -static inline void *dev_get_drvdata(const struct device *dev) -{ - return dev->driver_data; -} - -static inline void dev_set_drvdata(struct device *dev, void *data) -{ - dev->driver_data = data; -} - static inline unsigned int dev_get_uevent_suppress(const struct device *dev) { return dev->kobj.uevent_suppress; @@ -491,6 +481,8 @@ extern int device_rename(struct device *dev, char *new_name); extern int device_move(struct device *dev, struct device *new_parent, enum dpm_order dpm_order); extern const char *device_get_nodename(struct device *dev, const char **tmp); +extern void *dev_get_drvdata(const struct device *dev); +extern void dev_set_drvdata(struct device *dev, void *data); /* * Root device objects for grouping under /sys/devices |