diff options
author | Jean Delvare <jdelvare@suse.de> | 2014-04-14 06:58:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 16:46:59 -0400 |
commit | a996d010b648788b615938f6a26be6cf08d96aaf (patch) | |
tree | f6e9e8c327e7eccd191b42bb3055c9d9a13d5245 /include/linux/device.h | |
parent | d4332013919aa87dbdede67d677e4cf2cd32e898 (diff) |
driver core: Inline dev_set/get_drvdata
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>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 6d3a75773cd4..1b18c886445c 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -826,6 +826,16 @@ static inline void set_dev_node(struct device *dev, int node) | |||
826 | } | 826 | } |
827 | #endif | 827 | #endif |
828 | 828 | ||
829 | static inline void *dev_get_drvdata(const struct device *dev) | ||
830 | { | ||
831 | return dev->driver_data; | ||
832 | } | ||
833 | |||
834 | static inline void dev_set_drvdata(struct device *dev, void *data) | ||
835 | { | ||
836 | dev->driver_data = data; | ||
837 | } | ||
838 | |||
829 | static inline struct pm_subsys_data *dev_to_psd(struct device *dev) | 839 | static inline struct pm_subsys_data *dev_to_psd(struct device *dev) |
830 | { | 840 | { |
831 | return dev ? dev->power.subsys_data : NULL; | 841 | return dev ? dev->power.subsys_data : NULL; |
@@ -910,8 +920,6 @@ extern int device_move(struct device *dev, struct device *new_parent, | |||
910 | extern const char *device_get_devnode(struct device *dev, | 920 | extern const char *device_get_devnode(struct device *dev, |
911 | umode_t *mode, kuid_t *uid, kgid_t *gid, | 921 | umode_t *mode, kuid_t *uid, kgid_t *gid, |
912 | const char **tmp); | 922 | const char **tmp); |
913 | extern void *dev_get_drvdata(const struct device *dev); | ||
914 | extern void dev_set_drvdata(struct device *dev, void *data); | ||
915 | 923 | ||
916 | static inline bool device_supports_offline(struct device *dev) | 924 | static inline bool device_supports_offline(struct device *dev) |
917 | { | 925 | { |