lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

driver core: Inline dev_set/get_drvdata

Browse Source 
dev_set_drvdata and dev_get_drvdata are now simple enough again that
we can inline them as they used to be before commit b40284378.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jean Delvare
2014-04-14 12:58:53 +02:00
committed by Greg Kroah-Hartman
parent d433201391
commit a996d010b6
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/base/dd.c
View File

@@ -587,19 +587,3 @@ void driver_detach(struct device_driver *drv)
put_device(dev); put_device(dev);
} }
} }
/*
* These exports can't be _GPL due to .h files using this within them, and it
* might break something that was previously working...
*/
void *dev_get_drvdata(const struct device *dev)
{
return dev->driver_data;
}
EXPORT_SYMBOL(dev_get_drvdata);
void dev_set_drvdata(struct device *dev, void *data)
{
dev->driver_data = data;
}
EXPORT_SYMBOL(dev_set_drvdata);

12
include/linux/device.h
View File

@@ -826,6 +826,16 @@ static inline void set_dev_node(struct device *dev, int node)
} }
#endif #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 struct pm_subsys_data *dev_to_psd(struct device *dev) static inline struct pm_subsys_data *dev_to_psd(struct device *dev)
{ {
return dev ? dev->power.subsys_data : NULL; return dev ? dev->power.subsys_data : NULL;
@@ -910,8 +920,6 @@ extern int device_move(struct device *dev, struct device *new_parent,
extern const char *device_get_devnode(struct device *dev, extern const char *device_get_devnode(struct device *dev,
umode_t *mode, kuid_t *uid, kgid_t *gid, umode_t *mode, kuid_t *uid, kgid_t *gid,
const char **tmp); const char **tmp);
extern void *dev_get_drvdata(const struct device *dev);
extern void dev_set_drvdata(struct device *dev, void *data);
static inline bool device_supports_offline(struct device *dev) static inline bool device_supports_offline(struct device *dev)
{ {