mfd: arizona: Use irq_find_mapping when appropriate
Subsystems (2)
PATCH 2/2 mfd: arizona: Correctly clean up after IRQs
In reply to Charles KeepaxCurrently we leak a lot of things when tearing down the IRQs this patch fixes this cleaning up both the IRQ mappings and the IRQ domain itself.
--- drivers/mfd/arizona-irq.c | 54 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 14 deletions(-)
drivers/mfd/arizona-irq.c +40 -14
@@ -207,6 +207,7 @@ int arizona_irq_init(struct arizona *arizona)int ret, i;const struct regmap_irq_chip *aod, *irq;struct irq_data *irq_data; +unsigned int virq; arizona->ctrlif_error = true;
@@ -318,24 +319,34 @@ int arizona_irq_init(struct arizona *arizona) }if (aod) { - ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq,0 ), -IRQF_ONESHOT ,0 , aod, - &arizona->aod_irq_chip); + virq =irq_create_mapping (arizona->virq,0 ); +if (!virq) { +dev_err (arizona->dev, +"Failed to map AOD IRQs: %d\n" , ret); + goto err_domain; + } + + ret =regmap_add_irq_chip (arizona->regmap, virq,IRQF_ONESHOT , +0 , aod, &arizona->aod_irq_chip);if (ret !=0 ) {dev_err (arizona->dev,"Failed to add AOD IRQs: %d\n" , ret); - goto err; + goto err_map_aod; } } - ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq,1 ), -IRQF_ONESHOT ,0 , irq, - &arizona->irq_chip); + virq =irq_create_mapping (arizona->virq,1 ); +if (!virq) { +dev_err (arizona->dev, +"Failed to map main IRQs: %d\n" , ret); + goto err_aod; + } + + ret =regmap_add_irq_chip (arizona->regmap, virq,IRQF_ONESHOT , +0 , irq, &arizona->irq_chip);if (ret !=0 ) {dev_err (arizona->dev,"Failed to add main IRQs: %d\n" , ret); - goto err_aod; + goto err_map_main_irq; }/* Used to emulate edge trigger and to work around broken pinmux */
@@ -400,23 +411,38 @@ int arizona_irq_init(struct arizona *arizona) err_main_irq:regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), arizona->irq_chip); +err_map_main_irq: +irq_dispose_mapping (irq_find_mapping (arizona->virq,1 )); err_aod:regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), arizona->aod_irq_chip); +err_map_aod: +irq_dispose_mapping (irq_find_mapping (arizona->virq,0 )); +err_domain: +irq_domain_remove (arizona->virq); err:return ret; }int arizona_irq_exit (struct arizona *arizona) { +unsigned int virq; +if (arizona->ctrlif_error)free_irq (arizona_map_irq (arizona,ARIZONA_IRQ_CTRLIF_ERR ), arizona);free_irq (arizona_map_irq (arizona,ARIZONA_IRQ_BOOT_DONE ), arizona); -regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), - arizona->irq_chip); -regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), - arizona->aod_irq_chip); + + virq =irq_find_mapping (arizona->virq,1 ); +regmap_del_irq_chip (virq, arizona->irq_chip); +irq_dispose_mapping (virq); + + virq =irq_find_mapping (arizona->virq,0 ); +regmap_del_irq_chip (virq, arizona->aod_irq_chip); +irq_dispose_mapping (virq); + +irq_domain_remove (arizona->virq); +free_irq (arizona->irq, arizona);return 0 ;
Signature · 1 line
2.1.4
PATCH 1/2 mfd: arizona: Use irq_find_mapping when appropriate
No need to use irq_create_mapping (although there is no issue with doing so) when we are only looking up an existing mapping. Just to streamline things a little and make the code a little more clear change some calls from irq_create_mapping to irq_find_mapping.
--- drivers/mfd/arizona-irq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mfd/arizona-irq.c +4 -4
@@ -398,10 +398,10 @@ int arizona_irq_init(struct arizona *arizona) err_boot_done:free_irq (arizona->irq, arizona); err_main_irq: -regmap_del_irq_chip (irq_create_mapping (arizona->virq,1 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), arizona->irq_chip); err_aod: -regmap_del_irq_chip (irq_create_mapping (arizona->virq,0 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), arizona->aod_irq_chip); err:return ret;
@@ -413,9 +413,9 @@ int arizona_irq_exit(struct arizona *arizona)free_irq (arizona_map_irq (arizona,ARIZONA_IRQ_CTRLIF_ERR ), arizona);free_irq (arizona_map_irq (arizona,ARIZONA_IRQ_BOOT_DONE ), arizona); -regmap_del_irq_chip (irq_create_mapping (arizona->virq,1 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), arizona->irq_chip); -regmap_del_irq_chip (irq_create_mapping (arizona->virq,0 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), arizona->aod_irq_chip);free_irq (arizona->irq, arizona);
Signature · 1 line
2.1.4
Lee Jones
AppliedQuoted 9 lines · Charles Keepax
No need to use
irq_create_mapping(although there is no issue with doing so) when we are only looking up an existing mapping. Just to streamline things a little and make the code a little more clear change some calls fromirq_create_mappingtoirq_find_mapping.Signed-off-by Charles Keepax <[email protected]>--- drivers/mfd/arizona-irq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Applied, thanks.
Quoted 29 lines
drivers/mfd/arizona-irq.c +4
-4@@ -398,10 +398,10 @@ int arizona_irq_init(struct arizona *arizona) err_boot_done:free_irq (arizona->irq, arizona); err_main_irq: -regmap_del_irq_chip (irq_create_mapping (arizona->virq,1 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), arizona->irq_chip); err_aod: -regmap_del_irq_chip (irq_create_mapping (arizona->virq,0 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), arizona->aod_irq_chip); err:return ret;@@ -413,9 +413,9 @@ int arizona_irq_exit(struct arizona *arizona)free_irq (arizona_map_irq (arizona,ARIZONA_IRQ_CTRLIF_ERR ), arizona);free_irq (arizona_map_irq (arizona,ARIZONA_IRQ_BOOT_DONE ), arizona); -regmap_del_irq_chip (irq_create_mapping (arizona->virq,1 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), arizona->irq_chip); -regmap_del_irq_chip (irq_create_mapping (arizona->virq,0 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), arizona->aod_irq_chip);free_irq (arizona->irq, arizona);
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 2/2] mfd: arizona: Correctly clean up after IRQs
In reply to Charles KeepaxQuoted 23 lines · Charles Keepax
Currently we leak a lot of things when tearing down the IRQs this patch fixes this cleaning up both the IRQ mappings and the IRQ domain itself.
Signed-off-by Charles Keepax <[email protected]>--- drivers/mfd/arizona-irq.c | 54 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 14 deletions(-)drivers/mfd/arizona-irq.c +1
-0@@ -207,6 +207,7 @@ int arizona_irq_init(struct arizona *arizona)int ret, i;const struct regmap_irq_chip *aod, *irq;struct irq_data *irq_data; +unsigned int virq; arizona->ctrlif_error = true;@@ -318,24 +319,34 @@ int arizona_irq_init(struct arizona *arizona) }
drivers/mfd/arizona-irq.c int arizona_irq_init(struct arizona *arizona) · line 326
Quoted 10 lines
drivers/mfd/arizona-irq.c +5
-4if (aod) { - ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq,0 ), -IRQF_ONESHOT ,0 , aod, - &arizona->aod_irq_chip); + virq =irq_create_mapping (arizona->virq,0 ); +if (!virq) { +dev_err (arizona->dev, +"Failed to map AOD IRQs: %d\n" , ret); + goto err_domain;
One minor issue here we should be setting ret, as this one hasn't been applied yet I will send a new spin shortly.
Quoted 11 lines
drivers/mfd/arizona-irq.c +5
-1+ } + + ret =regmap_add_irq_chip (arizona->regmap, virq,IRQF_ONESHOT , +0 , aod, &arizona->aod_irq_chip);if (ret !=0 ) {dev_err (arizona->dev,"Failed to add AOD IRQs: %d\n" , ret); - goto err; + goto err_map_aod; } }
drivers/mfd/arizona-irq.c int arizona_irq_init(struct arizona *arizona) · line 342
Quoted 10 lines
drivers/mfd/arizona-irq.c +5
-4- ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq,1 ), -IRQF_ONESHOT ,0 , irq, - &arizona->irq_chip); + virq =irq_create_mapping (arizona->virq,1 ); +if (!virq) { +dev_err (arizona->dev, +"Failed to map main IRQs: %d\n" , ret); + goto err_aod;
ditto.
Thanks,
Charles