提交 c8705082 编写于 作者: U Uwe Kleine-König 提交者: Greg Kroah-Hartman

driver core: let dev_set_drvdata return int instead of void as it can fail

Before commit

	b4028437 (Driver core: move dev_get/set_drvdata to drivers/base/dd.c)

calling dev_set_drvdata with dev=NULL was an unchecked error. After some
discussion about what to return in this case removing the check (and so
producing a null pointer exception) seems fine.
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 4a03d6f7
...@@ -413,17 +413,16 @@ void *dev_get_drvdata(const struct device *dev) ...@@ -413,17 +413,16 @@ void *dev_get_drvdata(const struct device *dev)
} }
EXPORT_SYMBOL(dev_get_drvdata); EXPORT_SYMBOL(dev_get_drvdata);
void dev_set_drvdata(struct device *dev, void *data) int dev_set_drvdata(struct device *dev, void *data)
{ {
int error; int error;
if (!dev)
return;
if (!dev->p) { if (!dev->p) {
error = device_private_init(dev); error = device_private_init(dev);
if (error) if (error)
return; return error;
} }
dev->p->driver_data = data; dev->p->driver_data = data;
return 0;
} }
EXPORT_SYMBOL(dev_set_drvdata); EXPORT_SYMBOL(dev_set_drvdata);
...@@ -557,7 +557,7 @@ extern int device_move(struct device *dev, struct device *new_parent, ...@@ -557,7 +557,7 @@ extern int device_move(struct device *dev, struct device *new_parent,
extern const char *device_get_devnode(struct device *dev, extern const char *device_get_devnode(struct device *dev,
mode_t *mode, const char **tmp); mode_t *mode, const char **tmp);
extern void *dev_get_drvdata(const struct device *dev); extern void *dev_get_drvdata(const struct device *dev);
extern void dev_set_drvdata(struct device *dev, void *data); extern int dev_set_drvdata(struct device *dev, void *data);
/* /*
* Root device objects for grouping under /sys/devices * Root device objects for grouping under /sys/devices
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册