power: supply: ab8500: Cleanup probe in reverse order
Subsystems (2)
PATCH 1/3 power: supply: ab8500: Cleanup probe in reverse order
It is logical to cleanup in probe's error path in reverse order to previous actions. It also makes easier to add additional goto labels within this error path.
---
Not marking as cc-stable as this was not reproduced and not tested.
--- drivers/power/supply/ab8500_btemp.c | 4 ++-- drivers/power/supply/ab8500_fg.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/power/supply/ab8500_btemp.c +2 -2
@@ -1104,13 +1104,13 @@ static int ab8500_btemp_probe(struct platform_device *pdev)return ret; free_irq: -power_supply_unregister (di->btemp_psy); -/* We also have to free all successfully registered irqs */ for (i = i -1 ; i >=0 ; i--) { irq =platform_get_irq_byname (pdev, ab8500_btemp_irq[i].name);free_irq (irq, di); } + +power_supply_unregister (di->btemp_psy); free_btemp_wq:destroy_workqueue (di->btemp_wq);return ret;
drivers/power/supply/ab8500_fg.c +4 -4
@@ -3212,15 +3212,15 @@ static int ab8500_fg_probe(struct platform_device *pdev)return ret; free_irq: -power_supply_unregister (di->fg_psy); -/* We also have to free all registered irqs */ + irq =platform_get_irq_byname (pdev, ab8500_fg_irq_bh[0 ].name); +free_irq (irq, di);for (i =0 ; i <ARRAY_SIZE (ab8500_fg_irq_th); i++) { irq =platform_get_irq_byname (pdev, ab8500_fg_irq_th[i].name);free_irq (irq, di); } - irq =platform_get_irq_byname (pdev, ab8500_fg_irq_bh[0 ].name); -free_irq (irq, di); + +power_supply_unregister (di->fg_psy); free_inst_curr_wq:destroy_workqueue (di->fg_wq);return ret;
Signature · 1 line
2.17.1
PATCH 2/3 power: supply: ab8500_fg: Do not free non-requested IRQs in probe's error path
When requesting interrupt fails, free only interrupts already requested, not all of them.
---
Not marking as cc-stable as this was not reproduced and not tested.
--- drivers/power/supply/ab8500_fg.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/power/supply/ab8500_fg.c +5 -3
@@ -3158,7 +3158,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)if (ret !=0 ) {dev_err (di->dev,"failed to request %s IRQ %d: %d\n" , ab8500_fg_irq_th[i].name, irq, ret); - goto free_irq; + goto free_irq_th; }dev_dbg (di->dev,"Requested %s IRQ %d: %d\n" , ab8500_fg_irq_th[i].name, irq, ret);
@@ -3173,7 +3173,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)if (ret !=0 ) {dev_err (di->dev,"failed to request %s IRQ %d: %d\n" , ab8500_fg_irq_bh[0 ].name, irq, ret); - goto free_irq; + goto free_irq_th; }dev_dbg (di->dev,"Requested %s IRQ %d: %d\n" , ab8500_fg_irq_bh[0 ].name, irq, ret);
@@ -3215,7 +3215,9 @@ static int ab8500_fg_probe(struct platform_device *pdev)/* We also have to free all registered irqs */ irq =platform_get_irq_byname (pdev, ab8500_fg_irq_bh[0 ].name);free_irq (irq, di); -for (i =0 ; i <ARRAY_SIZE (ab8500_fg_irq_th); i++) { +free_irq_th: +while (--i >=0 ) { +/* Last assignment of i from primary interrupt handlers */ irq =platform_get_irq_byname (pdev, ab8500_fg_irq_th[i].name);free_irq (irq, di); }
Signature · 1 line
2.17.1
PATCH 3/3 power: supply: ab8500: Handle invalid IRQ from platform_get_irq_byname()
In reply to Krzysztof Kozlowskiplatform_get_irq_byname() might return -errno which later would be cast to an unsigned int and used in request_irq().
---
Not marking as cc-stable as this was not reproduced and not tested.
--- drivers/power/supply/ab8500_btemp.c | 5 +++++ drivers/power/supply/ab8500_charger.c | 5 +++++ drivers/power/supply/ab8500_fg.c | 10 ++++++++++ 3 files changed, 20 insertions(+)
drivers/power/supply/ab8500_btemp.c +5 -0
@@ -1082,6 +1082,11 @@ static int ab8500_btemp_probe(struct platform_device *pdev)/* Register interrupts */ for (i =0 ; i <ARRAY_SIZE (ab8500_btemp_irq); i++) { irq =platform_get_irq_byname (pdev, ab8500_btemp_irq[i].name); +if (irq <0 ) { + ret = irq; + goto free_irq; + } + ret =request_threaded_irq (irq,NULL , ab8500_btemp_irq[i].isr,IRQF_SHARED |IRQF_NO_SUSPEND , ab8500_btemp_irq[i].name, di);
drivers/power/supply/ab8500_charger.c +5 -0
@@ -3556,6 +3556,11 @@ static int ab8500_charger_probe(struct platform_device *pdev)/* Register interrupts */ for (i =0 ; i <ARRAY_SIZE (ab8500_charger_irq); i++) { irq =platform_get_irq_byname (pdev, ab8500_charger_irq[i].name); +if (irq <0 ) { + ret = irq; + goto free_irq; + } + ret =request_threaded_irq (irq,NULL , ab8500_charger_irq[i].isr,IRQF_SHARED |IRQF_NO_SUSPEND , ab8500_charger_irq[i].name, di);
drivers/power/supply/ab8500_fg.c +10 -0
@@ -3151,6 +3151,11 @@ static int ab8500_fg_probe(struct platform_device *pdev)/* Register primary interrupt handlers */ for (i =0 ; i <ARRAY_SIZE (ab8500_fg_irq_th); i++) { irq =platform_get_irq_byname (pdev, ab8500_fg_irq_th[i].name); +if (irq <0 ) { + ret = irq; + goto free_irq_th; + } + ret =request_irq (irq, ab8500_fg_irq_th[i].isr,IRQF_SHARED |IRQF_NO_SUSPEND , ab8500_fg_irq_th[i].name, di);
@@ -3166,6 +3171,11 @@ static int ab8500_fg_probe(struct platform_device *pdev)/* Register threaded interrupt handler */ irq =platform_get_irq_byname (pdev, ab8500_fg_irq_bh[0 ].name); +if (irq <0 ) { + ret = irq; + goto free_irq_th; + } + ret =request_threaded_irq (irq,NULL , ab8500_fg_irq_bh[0 ].isr,IRQF_SHARED |IRQF_NO_SUSPEND |IRQF_ONESHOT , ab8500_fg_irq_bh[0 ].name, di);
Signature · 1 line
2.17.1
Quoted 5 lines · Krzysztof Kozlowski
It is logical to cleanup in probe's error path in reverse order to previous actions. It also makes easier to add additional goto labels within this error path.
Signed-off-by Krzysztof Kozlowski <[email protected]>
For all 3 patches:
The battery charging code is currently disabled on ux500 simply because no platforms with batteries were available for testing or supported by any device trees.
This is getting fix: PostmarketOS is brewing patches for enabling all Ux500-based Samsung phones, all with batteries. So we will soon be able to test and turn this on.
The patches are fine to merge, however notice that we are refactoring all drivers using ADC through the IIO tree:
https://lore.kernel.org/linux-iio/[email protected]/
https://lore.kernel.org/linux-iio/[email protected]/
https://lore.kernel.org/linux-iio/[email protected]/
It would be nice if we could avoid colissions.
Yours,
Linus Walleij
Sebastian Reichel
maintainerHi,
Quoted 19 lines · Linus Walleij
Quoted 5 lines · Krzysztof Kozlowski
It is logical to cleanup in probe's error path in reverse order to previous actions. It also makes easier to add additional goto labels within this error path.
Signed-off-by Krzysztof Kozlowski <[email protected]>For all 3 patches:
Acked-by Linus Walleij <[email protected]>The battery charging code is currently disabled on ux500 simply because no platforms with batteries were available for testing or supported by any device trees.
This is getting fix: PostmarketOS is brewing patches for enabling all Ux500-based Samsung phones, all with batteries. So we will soon be able to test and turn this on.
Quoted 7 lines
The patches are fine to merge, however notice that we are refactoring all drivers using ADC through the IIO tree:
https://lore.kernel.org/linux-iio/[email protected]/
https://lore.kernel.org/linux-iio/[email protected]/
https://lore.kernel.org/linux-iio/[email protected]/It would be nice if we could avoid colissions.
Thanks, I merged your immutable branch for the ADC work and this patchset.
-- Sebastian