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 <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> --- drivers/base/dd.c | 3 +-- include/linux/device.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) --- linux-3.15-rc1.orig/drivers/base/dd.c 2014-04-14 12:52:52.957743343 +0200 +++ linux-3.15-rc1/drivers/base/dd.c 2014-04-14 12:54:21.520907390 +0200 @@ -583,9 +583,8 @@ void *dev_get_drvdata(const struct devic } 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); --- linux-3.15-rc1.orig/include/linux/device.h 2014-04-14 12:53:10.284166917 +0200 +++ linux-3.15-rc1/include/linux/device.h 2014-04-14 12:54:18.863842502 +0200 @@ -917,7 +917,7 @@ extern const char *device_get_devnode(st 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) { -- Jean Delvare SUSE L3 Support -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
