summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Masney <masneyb@onstation.org>2019-01-19 15:42:52 -0500
committerLinus Walleij <linus.walleij@linaro.org>2019-01-24 15:33:34 +0100
commite7dc6af82c284b8c79a0be5d2c9b555c3d793a3e (patch)
tree262b7bce2a0f9f8a588d3ff6a7fdfc974e43b992
parent135ef21ab064dd9811b51d5fa225829011adb10c (diff)
downloadlinux-e7dc6af82c284b8c79a0be5d2c9b555c3d793a3e.tar.bz2
spmi: pmic-arb: revert "disassociate old virq if hwirq mapping already exists"
Now that spmi-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. Driver was tested using gpio-keys and iadc/vadc on the LG Nexus 5 (hammerhead) phone. Signed-off-by: Brian Masney <masneyb@onstation.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/spmi/spmi-pmic-arb.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index 5666b99c9a92..316e2708f3ba 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -745,15 +745,10 @@ static int qpnpint_irq_domain_map(struct spmi_pmic_arb *pmic_arb,
irq_hw_number_t hwirq, unsigned int type)
{
irq_flow_handler_t handler;
- unsigned int old_virq;
dev_dbg(&pmic_arb->spmic->dev, "virq = %u, hwirq = %lu, type = %u\n",
virq, hwirq, type);
- old_virq = irq_find_mapping(domain, hwirq);
- if (old_virq)
- irq_domain_disassociate(domain, old_virq);
-
if (type & IRQ_TYPE_EDGE_BOTH)
handler = handle_edge_irq;
else if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))