spmi: Interrupt cleanups and API change preparation
cover spmi: Interrupt cleanups and API change preparation
The following patch series contains the following changes:
- Consolidation of chained interrupt handler setup/removal
- Switch to functions which avoid a redundant interrupt descriptor lookup
- Preparation of interrupt flow handlers for the 'irq' argument removal
The series has no dependencies and is also available as a git branch for your convenience:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/sh
If you want me to carry the patches in the irq/core branch of tip, please let me know.
Thanks,
tglx
PATCH 1/2 spmi/pmic_arb: Consolidate chained IRQ handler install/remove
Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.
Search and conversion was done with coccinelle.
--- drivers/spmi/spmi-pmic-arb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/spmi/spmi-pmic-arb.c +3 -6
@@ -928,8 +928,7 @@ static int spmi_pmic_arb_probe(struct pl goto err_put_ctrl; } -irq_set_handler_data (pa->irq, pa); -irq_set_chained_handler (pa->irq, pmic_arb_chained_irq); +irq_set_chained_handler_and_data (pa->irq, pmic_arb_chained_irq, pa); err =spmi_controller_add (ctrl);if (err)
@@ -938,8 +937,7 @@ static int spmi_pmic_arb_probe(struct plreturn 0 ; err_domain_remove: -irq_set_chained_handler (pa->irq,NULL ); -irq_set_handler_data (pa->irq,NULL ); +irq_set_chained_handler_and_data (pa->irq,NULL ,NULL );irq_domain_remove (pa->domain); err_put_ctrl:spmi_controller_put (ctrl);
@@ -951,8 +949,7 @@ static int spmi_pmic_arb_remove(struct pstruct spmi_controller *ctrl =platform_get_drvdata (pdev);struct spmi_pmic_arb_dev *pa =spmi_controller_get_drvdata (ctrl);spmi_controller_remove (ctrl); -irq_set_chained_handler (pa->irq,NULL ); -irq_set_handler_data (pa->irq,NULL ); +irq_set_chained_handler_and_data (pa->irq,NULL ,NULL );irq_domain_remove (pa->domain);spmi_controller_put (ctrl);return 0 ;
tip-bot for Thomas Gleixner
merge bot[tip:irq/core] spmi/pmic_arb: Consolidate chained IRQ handler install/remove
spmi/pmic_arb: Consolidate chained IRQ handler install/remove
Commit-ID: aab1b9ef7542e30f65116fe098ee36c5e522f7d1 Gitweb: http://git.kernel.org/tip/aab1b9ef7542e30f65116fe098ee36c5e522f7d1 Author: Thomas Gleixner <[email protected]> AuthorDate: Mon, 13 Jul 2015 20:52:24 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 27 Jul 2015 13:36:39 +0200
spmi/pmic_arb: Consolidate chained IRQ handler install/remove
Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.
Search and conversion was done with coccinelle.
--- drivers/spmi/spmi-pmic-arb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/spmi/spmi-pmic-arb.c +3 -6
@@ -928,8 +928,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) goto err_put_ctrl; } -irq_set_handler_data (pa->irq, pa); -irq_set_chained_handler (pa->irq, pmic_arb_chained_irq); +irq_set_chained_handler_and_data (pa->irq, pmic_arb_chained_irq, pa); err =spmi_controller_add (ctrl);if (err)
@@ -938,8 +937,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)return 0 ; err_domain_remove: -irq_set_chained_handler (pa->irq,NULL ); -irq_set_handler_data (pa->irq,NULL ); +irq_set_chained_handler_and_data (pa->irq,NULL ,NULL );irq_domain_remove (pa->domain); err_put_ctrl:spmi_controller_put (ctrl);
@@ -951,8 +949,7 @@ static int spmi_pmic_arb_remove(struct platform_device *pdev)struct spmi_controller *ctrl =platform_get_drvdata (pdev);struct spmi_pmic_arb_dev *pa =spmi_controller_get_drvdata (ctrl);spmi_controller_remove (ctrl); -irq_set_chained_handler (pa->irq,NULL ); -irq_set_handler_data (pa->irq,NULL ); +irq_set_chained_handler_and_data (pa->irq,NULL ,NULL );irq_domain_remove (pa->domain);spmi_controller_put (ctrl);return 0 ;
tip-bot for Thomas Gleixner
merge bot[tip:irq/core] spmi/pmic_arb: Consolidate chained IRQ handler install/remove
In reply to Thomas Gleixnerspmi/pmic_arb: Consolidate chained IRQ handler install/remove
Commit-ID: fb68ba6d0b06cf287e9081d60f705501c52124f6 Gitweb: http://git.kernel.org/tip/fb68ba6d0b06cf287e9081d60f705501c52124f6 Author: Thomas Gleixner <[email protected]> AuthorDate: Mon, 13 Jul 2015 20:52:24 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 29 Jul 2015 10:08:10 +0200
spmi/pmic_arb: Consolidate chained IRQ handler install/remove
Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.
Search and conversion was done with coccinelle.
--- drivers/spmi/spmi-pmic-arb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/spmi/spmi-pmic-arb.c +3 -6
@@ -928,8 +928,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) goto err_put_ctrl; } -irq_set_handler_data (pa->irq, pa); -irq_set_chained_handler (pa->irq, pmic_arb_chained_irq); +irq_set_chained_handler_and_data (pa->irq, pmic_arb_chained_irq, pa); err =spmi_controller_add (ctrl);if (err)
@@ -938,8 +937,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)return 0 ; err_domain_remove: -irq_set_chained_handler (pa->irq,NULL ); -irq_set_handler_data (pa->irq,NULL ); +irq_set_chained_handler_and_data (pa->irq,NULL ,NULL );irq_domain_remove (pa->domain); err_put_ctrl:spmi_controller_put (ctrl);
@@ -951,8 +949,7 @@ static int spmi_pmic_arb_remove(struct platform_device *pdev)struct spmi_controller *ctrl =platform_get_drvdata (pdev);struct spmi_pmic_arb_dev *pa =spmi_controller_get_drvdata (ctrl);spmi_controller_remove (ctrl); -irq_set_chained_handler (pa->irq,NULL ); -irq_set_handler_data (pa->irq,NULL ); +irq_set_chained_handler_and_data (pa->irq,NULL ,NULL );irq_domain_remove (pa->domain);spmi_controller_put (ctrl);return 0 ;
PATCH 2/2 spmi/pmic: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Thomas GleixnerFrom: Jiang Liu <[email protected]>
Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
--- drivers/spmi/spmi-pmic-arb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spmi/spmi-pmic-arb.c +2 -2
@@ -453,8 +453,8 @@ static void periph_interrupt(struct spmistatic void pmic_arb_chained_irq (unsigned int irq,struct irq_desc *desc) { -struct spmi_pmic_arb_dev *pa =irq_get_handler_data (irq); -struct irq_chip *chip =irq_get_chip (irq); +struct spmi_pmic_arb_dev *pa =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);void __iomem *intr = pa->intr;int first = pa->min_apid >>5 ;int last = pa->max_apid >>5 ;
tip-bot for Jiang Liu
merge bot[tip:irq/core] spmi/pmic: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
spmi/pmic: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Commit-ID: 61947039b3185378e60002e2224b89bfd1fb0785 Gitweb: http://git.kernel.org/tip/61947039b3185378e60002e2224b89bfd1fb0785 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 13 Jul 2015 20:52:25 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 27 Jul 2015 13:36:39 +0200
spmi/pmic: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
--- drivers/spmi/spmi-pmic-arb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spmi/spmi-pmic-arb.c +2 -2
@@ -453,8 +453,8 @@ static void periph_interrupt(struct spmi_pmic_arb_dev *pa, u8 apid)static void pmic_arb_chained_irq (unsigned int irq,struct irq_desc *desc) { -struct spmi_pmic_arb_dev *pa =irq_get_handler_data (irq); -struct irq_chip *chip =irq_get_chip (irq); +struct spmi_pmic_arb_dev *pa =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);void __iomem *intr = pa->intr;int first = pa->min_apid >>5 ;int last = pa->max_apid >>5 ;
tip-bot for Jiang Liu
merge bot[tip:irq/core] spmi/pmic: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Thomas Gleixnerspmi/pmic: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Commit-ID: 7fe88f3c00e7bfa44421681640fab3a9fadfef3b Gitweb: http://git.kernel.org/tip/7fe88f3c00e7bfa44421681640fab3a9fadfef3b Author: Jiang Liu <[email protected]> AuthorDate: Mon, 13 Jul 2015 20:52:25 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 29 Jul 2015 10:08:10 +0200
spmi/pmic: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
--- drivers/spmi/spmi-pmic-arb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spmi/spmi-pmic-arb.c +2 -2
@@ -453,8 +453,8 @@ static void periph_interrupt(struct spmi_pmic_arb_dev *pa, u8 apid)static void pmic_arb_chained_irq (unsigned int irq,struct irq_desc *desc) { -struct spmi_pmic_arb_dev *pa =irq_get_handler_data (irq); -struct irq_chip *chip =irq_get_chip (irq); +struct spmi_pmic_arb_dev *pa =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);void __iomem *intr = pa->intr;int first = pa->min_apid >>5 ;int last = pa->max_apid >>5 ;