Use IS_ERR() and PTR_ERR() instead of PTR_ERR_OR_ZERO() to
simplify code, avoid redundant judgements.
Signed-off-by: Zhang Shengju <redacted>
Signed-off-by: Tang Bin <redacted>
---
drivers/power/supply/cpcap-battery.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
index 90eba3646..7007e5d53 100644
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -912,10 +912,9 @@ static int cpcap_battery_probe(struct platform_device *pdev)
ddata->psy = devm_power_supply_register(ddata->dev, psy_desc,
&psy_cfg);
- error = PTR_ERR_OR_ZERO(ddata->psy);
- if (error) {
+ if (IS_ERR(ddata->psy)) {
dev_err(ddata->dev, "failed to register power supply\n");
- return error;
+ return PTR_ERR(ddata->psy);
}
atomic_set(&ddata->active, 1);--
2.20.1.windows.1