summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-04-14 14:57:43 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-28 00:46:50 +0400
commitd4332013919aa87dbdede67d677e4cf2cd32e898 (patch)
tree084e6ab8139da902a32b7bedef9110351e527d4b
parent2c1f1ff0f0d9e0df8c9b6d3697ac250900091541 (diff)
downloadlinux-d4332013919aa87dbdede67d677e4cf2cd32e898.tar.xz
driver core: dev_get_drvdata: Don't check for NULL dev
There is no point in calling dev_get_drvdata without a valid device. So checking for dev == NULL is pointless. If such a check is ever needed - which I doubt - the driver should do it before calling dev_get_drvdata. We were returning NULL if dev was NULL, which the caller certainly did not expect anyway, so that was only delaying the crash if the caller is not paying attention. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/dd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index d21f4b8dc37b..ba03353ff243 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -594,9 +594,7 @@ void driver_detach(struct device_driver *drv)
*/
void *dev_get_drvdata(const struct device *dev)
{
- if (dev)
- return dev->driver_data;
- return NULL;
+ return dev->driver_data;
}
EXPORT_SYMBOL(dev_get_drvdata);