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