From: NeilBrown <neilb@suse.de>
Date: Sun, 19 Feb 2012 02:10:00 +0000 (+1100)
Subject: w1_bq27000: remove unnecessary NULL test.
X-Git-Tag: v3.4-rc1~187^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b6c40b8581d5f2c88d18d7905b9ff6ba9956f506;p=~emulex%2Finfiniband.git

w1_bq27000: remove unnecessary NULL test.

As recent change means that we now dereference 'dev' before testing
for NULL.

That means either the change was wrong, or the test isn't needed.
As this function is only called from one driver (bq27x000_battery) and
it always passed a non-NULL dev, it seems good to assume that the
test isn't needed.

So remove it.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/w1/slaves/w1_bq27000.c b/drivers/w1/slaves/w1_bq27000.c
index 8f10fd2630a..50d9af708b2 100644
--- a/drivers/w1/slaves/w1_bq27000.c
+++ b/drivers/w1/slaves/w1_bq27000.c
@@ -45,9 +45,6 @@ static int w1_bq27000_read(struct device *dev, unsigned int reg)
 	u8 val;
 	struct w1_slave *sl = container_of(dev->parent, struct w1_slave, dev);
 
-	if (!dev)
-		return 0;
-
 	w1_write_8(sl->master, HDQ_CMD_READ | reg);
 	val = w1_read_8(sl->master);