mfd: arizona: Add defines for IRQs on the main Arizona IRQ domain
Subsystems (2)
PATCH 1/2 mfd: arizona: Add defines for IRQs on the main Arizona IRQ domain
Signed-off-by Charles Keepax <[email protected]>
--- drivers/mfd/arizona-irq.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/mfd/arizona-irq.c +15 -6
@@ -26,6 +26,9 @@#include "arizona.h" +#define ARIZONA_AOD_IRQ_INDEX 0 +#define ARIZONA_MAIN_IRQ_INDEX 1 +static int arizona_map_irq (struct arizona *arizona,int irq) {int ret;
@@ -319,7 +322,8 @@ int arizona_irq_init(struct arizona *arizona)if (aod) { ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq,0 ), +irq_create_mapping (arizona->virq, +ARIZONA_AOD_IRQ_INDEX ),IRQF_ONESHOT ,0 , aod, &arizona->aod_irq_chip);if (ret !=0 ) {
@@ -330,7 +334,8 @@ int arizona_irq_init(struct arizona *arizona) } ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq,1 ), +irq_create_mapping (arizona->virq, +ARIZONA_MAIN_IRQ_INDEX ),IRQF_ONESHOT ,0 , irq, &arizona->irq_chip);if (ret !=0 ) {
@@ -396,10 +401,12 @@ int arizona_irq_init(struct arizona *arizona) err_boot_done:free_irq (arizona->irq, arizona); err_main_irq: -regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq, +ARIZONA_MAIN_IRQ_INDEX ), arizona->irq_chip); err_aod: -regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq, +ARIZONA_AOD_IRQ_INDEX ), arizona->aod_irq_chip); err:return ret;
@@ -411,9 +418,11 @@ int arizona_irq_exit(struct arizona *arizona)arizona_free_irq (arizona,ARIZONA_IRQ_CTRLIF_ERR , arizona);arizona_free_irq (arizona,ARIZONA_IRQ_BOOT_DONE , arizona); -regmap_del_irq_chip (irq_find_mapping (arizona->virq,1 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq, +ARIZONA_MAIN_IRQ_INDEX ), arizona->irq_chip); -regmap_del_irq_chip (irq_find_mapping (arizona->virq,0 ), +regmap_del_irq_chip (irq_find_mapping (arizona->virq, +ARIZONA_AOD_IRQ_INDEX ), arizona->aod_irq_chip);free_irq (arizona->irq, arizona);
Signature · 1 line
2.1.4
PATCH v3 2/2 mfd: arizona: Correctly clean up after IRQs
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]>
---
Changes since v2:
- Updated to use the defines added in the previous patch
Thanks,
Charles
drivers/mfd/arizona-irq.c | 59 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 18 deletions(-)
drivers/mfd/arizona-irq.c +41 -18
@@ -210,6 +210,7 @@ int arizona_irq_init(struct arizona *arizona)int ret;const struct regmap_irq_chip *aod, *irq;struct irq_data *irq_data; +unsigned int virq; arizona->ctrlif_error = true;
@@ -321,26 +322,34 @@ int arizona_irq_init(struct arizona *arizona) }if (aod) { - ret =regmap_add_irq_chip (arizona->regmap, -irq_create_mapping (arizona->virq, -ARIZONA_AOD_IRQ_INDEX ), -IRQF_ONESHOT ,0 , aod, - &arizona->aod_irq_chip); + virq =irq_create_mapping (arizona->virq,ARIZONA_AOD_IRQ_INDEX ); +if (!virq) { +dev_err (arizona->dev,"Failed to map AOD IRQs\n" ); + ret = -EINVAL ; + 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, -ARIZONA_MAIN_IRQ_INDEX ), -IRQF_ONESHOT ,0 , irq, - &arizona->irq_chip); + virq =irq_create_mapping (arizona->virq,ARIZONA_MAIN_IRQ_INDEX ); +if (!virq) { +dev_err (arizona->dev,"Failed to map main IRQs\n" ); + ret = -EINVAL ; + 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 */
@@ -404,26 +413,40 @@ int arizona_irq_init(struct arizona *arizona)regmap_del_irq_chip (irq_find_mapping (arizona->virq,ARIZONA_MAIN_IRQ_INDEX ), arizona->irq_chip); +err_map_main_irq: +irq_dispose_mapping (irq_find_mapping (arizona->virq, +ARIZONA_MAIN_IRQ_INDEX )); err_aod:regmap_del_irq_chip (irq_find_mapping (arizona->virq,ARIZONA_AOD_IRQ_INDEX ), arizona->aod_irq_chip); +err_map_aod: +irq_dispose_mapping (irq_find_mapping (arizona->virq, +ARIZONA_AOD_IRQ_INDEX )); +err_domain: +irq_domain_remove (arizona->virq); err:return ret; }int arizona_irq_exit (struct arizona *arizona) { +unsigned int virq; +if (arizona->ctrlif_error)arizona_free_irq (arizona,ARIZONA_IRQ_CTRLIF_ERR , arizona);arizona_free_irq (arizona,ARIZONA_IRQ_BOOT_DONE , arizona); -regmap_del_irq_chip (irq_find_mapping (arizona->virq, -ARIZONA_MAIN_IRQ_INDEX ), - arizona->irq_chip); -regmap_del_irq_chip (irq_find_mapping (arizona->virq, -ARIZONA_AOD_IRQ_INDEX ), - arizona->aod_irq_chip); + virq =irq_find_mapping (arizona->virq,ARIZONA_MAIN_IRQ_INDEX ); +regmap_del_irq_chip (virq, arizona->irq_chip); +irq_dispose_mapping (virq); + + virq =irq_find_mapping (arizona->virq,ARIZONA_AOD_IRQ_INDEX ); +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