power: supply: bq27xxx: Simplify with dev_err_probe()
Subsystems (5)
PATCH 1/5 power: supply: bq27xxx: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.
--- drivers/power/supply/bq27xxx_battery.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/power/supply/bq27xxx_battery.c +3 -7
@@ -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);
Signature · 1 line
2.17.1
PATCH 2/5 power: supply: cpcap: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.
--- drivers/power/supply/cpcap-battery.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/power/supply/cpcap-battery.c +2 -5
@@ -747,11 +747,8 @@ static int cpcap_battery_init_iio(struct cpcap_battery_ddata *ddata)return 0 ; out_err: -if (error != -EPROBE_DEFER ) -dev_err (ddata->dev,"could not initialize VBUS or ID IIO: %i\n" , - error); - -return error; +return dev_err_probe (ddata->dev, error, +"could not initialize VBUS or ID IIO\n" ); }/* Calibrate coulomb counter */
Signature · 1 line
2.17.1
PATCH 3/5 power: supply: gpio-charger: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.
--- drivers/power/supply/gpio-charger.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/power/supply/gpio-charger.c +2 -4
@@ -173,10 +173,8 @@ static int gpio_charger_probe(struct platform_device *pdev) gpio_charger->gpiod =gpio_to_desc (pdata->gpio); }else if (IS_ERR (gpio_charger->gpiod)) {/* Just try again if this happens */ -if (PTR_ERR (gpio_charger->gpiod) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; -dev_err (dev,"error getting GPIO descriptor\n" ); -return PTR_ERR (gpio_charger->gpiod); +return dev_err_probe (dev,PTR_ERR (gpio_charger->gpiod), +"error getting GPIO descriptor\n" ); }if (gpio_charger->gpiod) {
Signature · 1 line
2.17.1
PATCH 4/5 power: supply: ingenic: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.
--- drivers/power/supply/ingenic-battery.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/power/supply/ingenic-battery.c +3 -5
@@ -147,11 +147,9 @@ static int ingenic_battery_probe(struct platform_device *pdev) psy_cfg.of_node = dev->of_node; bat->battery =devm_power_supply_register (dev, desc, &psy_cfg); -if (IS_ERR (bat->battery)) { -if (PTR_ERR (bat->battery) != -EPROBE_DEFER ) -dev_err (dev,"Unable to register battery\n" ); -return PTR_ERR (bat->battery); - } +if (IS_ERR (bat->battery)) +return dev_err_probe (dev,PTR_ERR (bat->battery), +"Unable to register battery\n" ); ret =power_supply_get_battery_info (bat->battery, &bat->info);if (ret) {
Signature · 1 line
2.17.1
PATCH 5/5 power: supply: lego_ev3: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.
--- drivers/power/supply/lego_ev3_battery.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/power/supply/lego_ev3_battery.c +9 -15
@@ -166,27 +166,21 @@ static int lego_ev3_battery_probe(struct platform_device *pdev) batt->iio_v =devm_iio_channel_get (dev,"voltage" ); err =PTR_ERR_OR_ZERO (batt->iio_v); -if (err) { -if (err != -EPROBE_DEFER ) -dev_err (dev,"Failed to get voltage iio channel\n" ); -return err; - } +if (err) +return dev_err_probe (dev, err, +"Failed to get voltage iio channel\n" ); batt->iio_i =devm_iio_channel_get (dev,"current" ); err =PTR_ERR_OR_ZERO (batt->iio_i); -if (err) { -if (err != -EPROBE_DEFER ) -dev_err (dev,"Failed to get current iio channel\n" ); -return err; - } +if (err) +return dev_err_probe (dev, err, +"Failed to get current iio channel\n" ); batt->rechargeable_gpio =devm_gpiod_get (dev,"rechargeable" ,GPIOD_IN ); err =PTR_ERR_OR_ZERO (batt->rechargeable_gpio); -if (err) { -if (err != -EPROBE_DEFER ) -dev_err (dev,"Failed to get rechargeable gpio\n" ); -return err; - } +if (err) +return dev_err_probe (dev, err, +"Failed to get rechargeable gpio\n" );/* * The rechargeable battery indication switch cannot be changed without
Signature · 1 line
2.17.1
Re: [PATCH 5/5] power: supply: lego_ev3: Simplify with dev_err_probe()
Quoted 5 lines · Krzysztof Kozlowski
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 <[email protected]>---
Re: [PATCH 5/5] power: supply: lego_ev3: Simplify with dev_err_probe()
Hi,
Quoted 8 lines · David Lechner
Quoted 5 lines · Krzysztof Kozlowski
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 <[email protected]>---
Reviewed-by David Lechner <[email protected]>
Thanks Krzysztof, I queued all 5 patches.
-- Sebastian