These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mfd / wm831x-irq.c

diff --git a/kernel/drivers/mfd/wm831x-irq.c b/kernel/drivers/mfd/wm831x-irq.c
index 64e512e..dfea8b9 100644 (file)
--- a/kernel/drivers/mfd/wm831x-irq.c
+++ b/kernel/drivers/mfd/wm831x-irq.c
@@ -552,19 +552,12 @@ static int wm831x_irq_map(struct irq_domain *h, unsigned int virq,
        irq_set_chip_data(virq, h->host_data);
        irq_set_chip_and_handler(virq, &wm831x_irq_chip, handle_edge_irq);
        irq_set_nested_thread(virq, 1);
-
-       /* ARM needs us to explicitly flag the IRQ as valid
-        * and will set them noprobe when we do so. */
-#ifdef CONFIG_ARM
-       set_irq_flags(virq, IRQF_VALID);
-#else
        irq_set_noprobe(virq);
-#endif
 
        return 0;
 }
 
-static struct irq_domain_ops wm831x_irq_domain_ops = {
+static const struct irq_domain_ops wm831x_irq_domain_ops = {
        .map    = wm831x_irq_map,
        .xlate  = irq_domain_xlate_twocell,
 };