]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
driver core: dev_get_drvdata: Don't check for NULL dev
authorJean Delvare <jdelvare@suse.de>
Mon, 14 Apr 2014 10:57:43 +0000 (12:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 May 2014 20:46:50 +0000 (13:46 -0700)
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>
drivers/base/dd.c

index d21f4b8dc37b9f0f8128cb9d3524b8cdd6973ea8..ba03353ff2437d8edb395454c19402642fd9b6ec 100644 (file)
@@ -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);