linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] pm2301-charger: remove unneeded NULL checks
@ 2013-11-07  8:06 Dan Carpenter
  2013-11-13  6:39 ` Anton Vorontsov
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2013-11-07  8:06 UTC (permalink / raw)
  To: Anton Vorontsov, Lee Jones; +Cc: David Woodhouse, linux-kernel, kernel-janitors

If "pm2" were NULL we would oops printing the error message.
Fortunately, that's not possible so I have removed the NULL checks.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index b733c69..62c15af 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -957,37 +957,24 @@ static int  pm2xxx_runtime_suspend(struct device *dev)
 {
 	struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
 	struct pm2xxx_charger *pm2;
-	int ret = 0;
 
 	pm2 = (struct pm2xxx_charger *)i2c_get_clientdata(pm2xxx_i2c_client);
-	if (!pm2) {
-		dev_err(pm2->dev, "no pm2xxx_charger data supplied\n");
-		ret = -EINVAL;
-		return ret;
-	}
-
 	clear_lpn_pin(pm2);
 
-	return ret;
+	return 0;
 }
 
 static int  pm2xxx_runtime_resume(struct device *dev)
 {
 	struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
 	struct pm2xxx_charger *pm2;
-	int ret = 0;
 
 	pm2 = (struct pm2xxx_charger *)i2c_get_clientdata(pm2xxx_i2c_client);
-	if (!pm2) {
-		dev_err(pm2->dev, "no pm2xxx_charger data supplied\n");
-		ret = -EINVAL;
-		return ret;
-	}
 
 	if (gpio_is_valid(pm2->lpn_pin) && gpio_get_value(pm2->lpn_pin) == 0)
 		set_lpn_pin(pm2);
 
-	return ret;
+	return 0;
 }
 
 #endif

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [patch] pm2301-charger: remove unneeded NULL checks
  2013-11-07  8:06 [patch] pm2301-charger: remove unneeded NULL checks Dan Carpenter
@ 2013-11-13  6:39 ` Anton Vorontsov
  0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2013-11-13  6:39 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: Lee Jones, David Woodhouse, linux-kernel, kernel-janitors

On Thu, Nov 07, 2013 at 11:06:17AM +0300, Dan Carpenter wrote:
> If "pm2" were NULL we would oops printing the error message.
> Fortunately, that's not possible so I have removed the NULL checks.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied, thanks!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-11-13  6:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-07  8:06 [patch] pm2301-charger: remove unneeded NULL checks Dan Carpenter
2013-11-13  6:39 ` Anton Vorontsov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).