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

[kvmfornfv.git] / kernel / drivers / mfd / max8925-core.c

diff --git a/kernel/drivers/mfd/max8925-core.c b/kernel/drivers/mfd/max8925-core.c
index 97a787a..fd8b15c 100644 (file)
--- a/kernel/drivers/mfd/max8925-core.c
+++ b/kernel/drivers/mfd/max8925-core.c
@@ -650,15 +650,12 @@ static int max8925_irq_domain_map(struct irq_domain *d, unsigned int virq,
        irq_set_chip_data(virq, d->host_data);
        irq_set_chip_and_handler(virq, &max8925_irq_chip, handle_edge_irq);
        irq_set_nested_thread(virq, 1);
-#ifdef CONFIG_ARM
-       set_irq_flags(virq, IRQF_VALID);
-#else
        irq_set_noprobe(virq);
-#endif
+
        return 0;
 }
 
-static struct irq_domain_ops max8925_irq_domain_ops = {
+static const struct irq_domain_ops max8925_irq_domain_ops = {
        .map    = max8925_irq_domain_map,
        .xlate  = irq_domain_xlate_onetwocell,
 };