summaryrefslogtreecommitdiff
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-04-14 12:58:53 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-27 13:46:59 -0700
commita996d010b648788b615938f6a26be6cf08d96aaf (patch)
treef6e9e8c327e7eccd191b42bb3055c9d9a13d5245 /include/linux/device.h
parentd4332013919aa87dbdede67d677e4cf2cd32e898 (diff)
downloadlwn-a996d010b648788b615938f6a26be6cf08d96aaf.tar.gz
lwn-a996d010b648788b615938f6a26be6cf08d96aaf.zip
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.h12
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)
}
#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)
{
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,
umode_t *mode, kuid_t *uid, kgid_t *gid,
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)
{