From 95073cc2e53c1352f2c244408d1bd005b07650fd Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Tue, 24 May 2016 13:34:51 -0500 Subject: [PATCH] greybus: use PTR_ERR_OR_ZERO() Coccinelle points out that the macro PTR_ERR_OR_ZERO() handles the frequent case of converting a pointer into either error code (if its value is an encoded error value) or 0 (otherwise). Switch some code in gb_power_supply_register() to use that macro. I have verified this is true of the kernel we're now working with (arche-6.0). Signed-off-by: Alex Elder Reviewed-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/power_supply.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c index 9cae396c6115..8d6570d1bb61 100644 --- a/drivers/staging/greybus/power_supply.c +++ b/drivers/staging/greybus/power_supply.c @@ -547,10 +547,7 @@ static int gb_power_supply_register(struct gb_power_supply *gbpsy) gbpsy->psy = power_supply_register(&connection->bundle->dev, &gbpsy->desc, &cfg); - if (IS_ERR(gbpsy->psy)) - return PTR_ERR(gbpsy->psy); - - return 0; + return PTR_ERR_OR_ZERO(gbpsy->psy); } #endif -- 2.45.2