summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorBrian Masney <masneyb@onstation.org>2019-02-08 03:16:31 +0100
committerLinus Walleij <linus.walleij@linaro.org>2019-02-13 09:35:12 +0100
commit1a25d59a55292631a6c601fda5413abc297097b7 (patch)
tree489227d32d234421f6135389f86207cfaf41ad08 /drivers/mfd
parentARM: dts: qcom-apq8060: Fix up interrupt parents (diff)
downloadlinux-1a25d59a55292631a6c601fda5413abc297097b7.tar.xz
linux-1a25d59a55292631a6c601fda5413abc297097b7.zip
mfd: pm8xxx: revert "disassociate old virq if hwirq mapping already exists"
Now that ssbi-gpio is a proper hierarchical IRQ chip, and all in-tree users of device tree have been updated, we can now drop the hack that was introduced to disassociate the old Linux virq if a hwirq mapping already exists. That patch was introduced to not break git bisect for any existing boards. This change was tested on an APQ8060 DragonBoard. Signed-off-by: Brian Masney <masneyb@onstation.org> Tested-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/qcom-pm8xxx.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c
index 2f99a98ccee5..8eb2528793f9 100644
--- a/drivers/mfd/qcom-pm8xxx.c
+++ b/drivers/mfd/qcom-pm8xxx.c
@@ -380,12 +380,6 @@ static void pm8xxx_irq_domain_map(struct pm_irq_chip *chip,
struct irq_domain *domain, unsigned int irq,
irq_hw_number_t hwirq, unsigned int type)
{
- unsigned int old_virq;
-
- old_virq = irq_find_mapping(domain, hwirq);
- if (old_virq)
- irq_domain_disassociate(domain, old_virq);
-
irq_domain_set_info(domain, irq, hwirq, chip->pm_irq_data->irq_chip,
chip, handle_level_irq, NULL, NULL);
irq_set_noprobe(irq);