diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index d14b6e89589661f1f6ce638377b96bb968241438..d21f4b8dc37b9f0f8128cb9d3524b8cdd6973ea8 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 5c94ac3e7972f9acad86fe97da0ba7d6b34fdf67..6d3a75773cd426a7e8dd130b96954e2919660e9d 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)
 {