OSDN Git Service

power: supply: bq27xxx: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 26 Aug 2020 14:48:54 +0000 (16:48 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Wed, 26 Aug 2020 15:25:42 +0000 (17:25 +0200)
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and also it prints the error value.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/bq27xxx_battery.c

index a123f6e..6176890 100644 (file)
@@ -1992,13 +1992,9 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di)
        psy_desc->external_power_changed = bq27xxx_external_power_changed;
 
        di->bat = power_supply_register_no_ws(di->dev, psy_desc, &psy_cfg);
-       if (IS_ERR(di->bat)) {
-               if (PTR_ERR(di->bat) == -EPROBE_DEFER)
-                       dev_dbg(di->dev, "failed to register battery, deferring probe\n");
-               else
-                       dev_err(di->dev, "failed to register battery\n");
-               return PTR_ERR(di->bat);
-       }
+       if (IS_ERR(di->bat))
+               return dev_err_probe(di->dev, PTR_ERR(di->bat),
+                                    "failed to register battery\n");
 
        bq27xxx_battery_settings(di);
        bq27xxx_battery_update(di);