From: Jean Delvare Date: Mon, 14 Apr 2014 10:57:43 +0000 (+0200) Subject: driver core: dev_get_drvdata: Don't check for NULL dev X-Git-Tag: v3.16-rc1~30^2~37^2~6 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d4332013919aa87dbdede67d677e4cf2cd32e898;p=linux.git 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 Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- 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);