Messages in this thread Patch in this message | | | From | Uwe Kleine-König <> | Subject | [PATCH 5/5] driver core: let dev_set_drvdata return int instead of void as it can fail | Date | Wed, 6 Apr 2011 11:24:25 +0200 |
| |
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Hello,
I wasn't sure what to return when dev_set_drvdata is called with dev=NULL. I choosed 0, but -EINVAL would be OK for me, too. What do you think?
And we could add __must_check, maybe do this later =:-)
Best regards Uwe
drivers/base/dd.c | 8 +++++--- include/linux/device.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index da57ee9..29ff339 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -408,17 +408,19 @@ void *dev_get_drvdata(const struct device *dev) } 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; if (!dev) - return; + return 0; + if (!dev->p) { error = device_private_init(dev); if (error) - return; + return error; } dev->p->driver_data = data; + return 0; } EXPORT_SYMBOL(dev_set_drvdata); diff --git a/include/linux/device.h b/include/linux/device.h index 1bf5cf0..9e754c7 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -558,7 +558,7 @@ extern int device_move(struct device *dev, struct device *new_parent, extern const char *device_get_devnode(struct device *dev, mode_t *mode, const char **tmp); 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 -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |