mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jean Delvare <jdelvare@suse.de>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/5] driver core: dev_get_drvdata: Don't check for NULL dev
Date: Mon, 14 Apr 2014 12:57:43 +0200	[thread overview]
Message-ID: <20140414125743.2ed17988@endymion.delvare> (raw)
In-Reply-To: <20140414124802.2859439e@endymion.delvare>

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>
---
 drivers/base/dd.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- linux-3.15-rc0.orig/drivers/base/dd.c	2014-04-09 16:16:01.631698736 +0200
+++ linux-3.15-rc0/drivers/base/dd.c	2014-04-09 16:55:09.293001255 +0200
@@ -577,9 +577,7 @@ void driver_detach(struct device_driver
  */
 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);
 

-- 
Jean Delvare
SUSE L3 Support

  parent reply	other threads:[~2014-04-14 10:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-14 10:48 [PATCH 0/5] driver core: Clean up dev_get/set_drvdata Jean Delvare
2014-04-14 10:54 ` [PATCH 1/5] driver core: Move driver_data back to struct device Jean Delvare
2014-04-14 10:55 ` [PATCH 2/5] driver core: dev_set_drvdata can no longer fail Jean Delvare
2014-04-14 10:56 ` [PATCH 3/5] driver core: dev_set_drvdata returns void Jean Delvare
2014-04-14 10:57 ` Jean Delvare [this message]
2014-04-14 10:58 ` [PATCH 5/5] driver core: Inline dev_set/get_drvdata Jean Delvare
2014-04-14 11:50 ` [PATCH 0/5] driver core: Clean up dev_get/set_drvdata Greg KH
2014-05-27 20:50 ` Greg KH
2014-05-27 20:57   ` Jean Delvare

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140414125743.2ed17988@endymion.delvare \
    --to=jdelvare@suse.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®