summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-04-14 12:56:34 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-27 13:42:02 -0700
commit2c1f1ff0f0d9e0df8c9b6d3697ac250900091541 (patch)
tree66d570535abb71316d786f7e0b13523d2dccb906
parent8283b4919e00fb110ac338d6b9984ca92d5030fa (diff)
driver core: dev_set_drvdata returns void
dev_set_drvdata can no longer fail, so it could return void. All callers have hopefully been updated to no longer check for the return value. Signed-off-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/dd.c3
-rw-r--r--include/linux/device.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index d14b6e89589..d21f4b8dc37 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -600,9 +600,8 @@ void *dev_get_drvdata(const struct device *dev)
}
EXPORT_SYMBOL(dev_get_drvdata);
-int dev_set_drvdata(struct device *dev, void *data)
+void dev_set_drvdata(struct device *dev, void *data)
{
dev->driver_data = data;
- return 0;
}
EXPORT_SYMBOL(dev_set_drvdata);
diff --git a/include/linux/device.h b/include/linux/device.h
index 5c94ac3e797..6d3a75773cd 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -911,7 +911,7 @@ 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 int dev_set_drvdata(struct device *dev, void *data);
+extern void dev_set_drvdata(struct device *dev, void *data);
static inline bool device_supports_offline(struct device *dev)
{