Merge tag 'irqchip-core-4.8' of git://git.infradead.org/users/jcooper/linux into irq/core

Pull irqchip core changes from Jason Cooper:

 - bcm283x avoid handle_IRQ
 - Fix sparse warnings on __iomem
 - Fix static functions
 - Fix missing includes
 - Replace __raw IO accessors to support big endian

12 files changed, 53 insertions, 45 deletions

diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c
index ead15be2d20a..b78a169c9c83 100644
--- a/drivers/irqchip/exynos-combiner.c
+++ b/drivers/irqchip/exynos-combiner.c
@@ -55,14 +55,14 @@ static void combiner_mask_irq(struct irq_data *data)
 {
         u32 mask = 1 << (data->hwirq % 32);
 
-        __raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_CLEAR);
+        writel_relaxed(mask, combiner_base(data) + COMBINER_ENABLE_CLEAR);
 }
 
 static void combiner_unmask_irq(struct irq_data *data)
 {
         u32 mask = 1 << (data->hwirq % 32);
 
-        __raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET);
+        writel_relaxed(mask, combiner_base(data) + COMBINER_ENABLE_SET);
 }
 
 static void combiner_handle_cascade_irq(struct irq_desc *desc)
@@ -75,7 +75,7 @@ static void combiner_handle_cascade_irq(struct irq_desc *desc)
         chained_irq_enter(chip, desc);
 
         spin_lock(&irq_controller_lock);
-        status = __raw_readl(chip_data->base + COMBINER_INT_STATUS);
+        status = readl_relaxed(chip_data->base + COMBINER_INT_STATUS);
         spin_unlock(&irq_controller_lock);
         status &= chip_data->irq_mask;
 
@@ -135,7 +135,7 @@ static void __init combiner_init_one(struct combiner_chip_data *combiner_data,
         combiner_data->parent_irq = irq;
 
         /* Disable all interrupts */
-        __raw_writel(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR);
+        writel_relaxed(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR);
 }
 
 static int combiner_irq_domain_xlate(struct irq_domain *d,
@@ -218,7 +218,7 @@ static int combiner_suspend(void)
 
         for (i = 0; i < max_nr; i++)
                 combiner_data[i].pm_save =
-                        __raw_readl(combiner_data[i].base + COMBINER_ENABLE_SET);
+                        readl_relaxed(combiner_data[i].base + COMBINER_ENABLE_SET);
 
         return 0;
 }
@@ -235,9 +235,9 @@ static void combiner_resume(void)
         int i;
 
         for (i = 0; i < max_nr; i++) {
-                __raw_writel(combiner_data[i].irq_mask,
+                writel_relaxed(combiner_data[i].irq_mask,
                              combiner_data[i].base + COMBINER_ENABLE_CLEAR);
-                __raw_writel(combiner_data[i].pm_save,
+                writel_relaxed(combiner_data[i].pm_save,
                              combiner_data[i].base + COMBINER_ENABLE_SET);
         }
 }
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index e7dc6cbda2a1..7c42b1d13faf 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -541,7 +541,7 @@ static void armada_370_xp_mpic_resume(void)
                 writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS);
 }
 
-struct syscore_ops armada_370_xp_mpic_syscore_ops = {
+static struct syscore_ops armada_370_xp_mpic_syscore_ops = {
         .suspend        = armada_370_xp_mpic_suspend,
         .resume         = armada_370_xp_mpic_resume,
 };
diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
index bf9cc5f2e839..44d7c38dde47 100644
--- a/drivers/irqchip/irq-bcm2835.c
+++ b/drivers/irqchip/irq-bcm2835.c
@@ -52,7 +52,6 @@
 #include <linux/irqdomain.h>
 
 #include <asm/exception.h>
-#include <asm/mach/irq.h>
 
 /* Put the bank and irq (32 bits) into the hwirq */
 #define MAKE_HWIRQ(b, n)        ((b << 5) | (n))
@@ -242,7 +241,7 @@ static void __exception_irq_entry bcm2835_handle_irq(
         u32 hwirq;
 
         while ((hwirq = get_next_armctrl_hwirq()) != ~0)
-                handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs);
+                handle_domain_irq(intc.domain, hwirq, regs);
 }
 
 static void bcm2836_chained_handle_irq(struct irq_desc *desc)
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
index 72ff1d5c5de6..df1949c0aa23 100644
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -180,7 +180,7 @@ __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs)
         } else if (stat) {
                 u32 hwirq = ffs(stat) - 1;
 
-                handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs);
+                handle_domain_irq(intc.domain, hwirq, regs);
         }
 }
 
@@ -224,8 +224,8 @@ static struct notifier_block bcm2836_arm_irqchip_cpu_notifier = {
 };
 
 #ifdef CONFIG_ARM
-int __init bcm2836_smp_boot_secondary(unsigned int cpu,
-                                      struct task_struct *idle)
+static int __init bcm2836_smp_boot_secondary(unsigned int cpu,
+                                             struct task_struct *idle)
 {
         unsigned long secondary_startup_phys =
                 (unsigned long)virt_to_phys((void *)secondary_startup);
diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
index 61b18ab33ad9..0ec92631e23c 100644
--- a/drivers/irqchip/irq-bcm7120-l2.c
+++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -215,7 +215,7 @@ static int __init bcm7120_l2_intc_iomap_3380(struct device_node *dn,
         return 0;
 }
 
-int __init bcm7120_l2_intc_probe(struct device_node *dn,
+static int __init bcm7120_l2_intc_probe(struct device_node *dn,
                                  struct device_node *parent,
                                  int (*iomap_regs_fn)(struct device_node *,
                                         struct bcm7120_l2_intc_data *),
@@ -339,15 +339,15 @@ out_unmap:
         return ret;
 }
 
-int __init bcm7120_l2_intc_probe_7120(struct device_node *dn,
-                                      struct device_node *parent)
+static int __init bcm7120_l2_intc_probe_7120(struct device_node *dn,
+                                             struct device_node *parent)
 {
         return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_7120,
                                      "BCM7120 L2");
 }
 
-int __init bcm7120_l2_intc_probe_3380(struct device_node *dn,
-                                      struct device_node *parent)
+static int __init bcm7120_l2_intc_probe_3380(struct device_node *dn,
+                                             struct device_node *parent)
 {
         return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_3380,
                                      "BCM3380 L2");
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c
index 65cd341f331a..1d4a5b46d9ae 100644
--- a/drivers/irqchip/irq-brcmstb-l2.c
+++ b/drivers/irqchip/irq-brcmstb-l2.c
@@ -112,8 +112,8 @@ static void brcmstb_l2_intc_resume(struct irq_data *d)
         irq_gc_unlock(gc);
 }
 
-int __init brcmstb_l2_intc_of_init(struct device_node *np,
-                                        struct device_node *parent)
+static int __init brcmstb_l2_intc_of_init(struct device_node *np,
+                                          struct device_node *parent)
 {
         unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
         struct brcmstb_l2_intc_data *data;
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index ad0d2960b664..35eb7ac5d21f 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -24,6 +24,7 @@
 #include <linux/of_pci.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/irqchip/arm-gic.h>
 
 /*
 * MSI_TYPER:
diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index 9d1bcfc33e4c..b04a8ac6e744 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -23,6 +23,8 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 
+#include <linux/irqchip/irq-omap-intc.h>
+
 /* Define these here for now until we drop all board-files */
 #define OMAP24XX_IC_BASE        0x480fe000
 #define OMAP34XX_IC_BASE        0x48200000
diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c
index 5dc5a760c723..c25ce5af091a 100644
--- a/drivers/irqchip/irq-s3c24xx.c
+++ b/drivers/irqchip/irq-s3c24xx.c
@@ -92,9 +92,9 @@ static void s3c_irq_mask(struct irq_data *data)
         unsigned long mask;
         unsigned int irqno;
 
-        mask = __raw_readl(intc->reg_mask);
+        mask = readl_relaxed(intc->reg_mask);
         mask |= (1UL << irq_data->offset);
-        __raw_writel(mask, intc->reg_mask);
+        writel_relaxed(mask, intc->reg_mask);
 
         if (parent_intc) {
                 parent_data = &parent_intc->irqs[irq_data->parent_irq];
@@ -119,9 +119,9 @@ static void s3c_irq_unmask(struct irq_data *data)
         unsigned long mask;
         unsigned int irqno;
 
-        mask = __raw_readl(intc->reg_mask);
+        mask = readl_relaxed(intc->reg_mask);
         mask &= ~(1UL << irq_data->offset);
-        __raw_writel(mask, intc->reg_mask);
+        writel_relaxed(mask, intc->reg_mask);
 
         if (parent_intc) {
                 irqno = irq_find_mapping(parent_intc->domain,
@@ -136,9 +136,9 @@ static inline void s3c_irq_ack(struct irq_data *data)
         struct s3c_irq_intc *intc = irq_data->intc;
         unsigned long bitval = 1UL << irq_data->offset;
 
-        __raw_writel(bitval, intc->reg_pending);
+        writel_relaxed(bitval, intc->reg_pending);
         if (intc->reg_intpnd)
-                __raw_writel(bitval, intc->reg_intpnd);
+                writel_relaxed(bitval, intc->reg_intpnd);
 }
 
 static int s3c_irq_type(struct irq_data *data, unsigned int type)
@@ -172,9 +172,9 @@ static int s3c_irqext_type_set(void __iomem *gpcon_reg,
         unsigned long newvalue = 0, value;
 
         /* Set the GPIO to external interrupt mode */
-        value = __raw_readl(gpcon_reg);
+        value = readl_relaxed(gpcon_reg);
         value = (value & ~(3 << gpcon_offset)) | (0x02 << gpcon_offset);
-        __raw_writel(value, gpcon_reg);
+        writel_relaxed(value, gpcon_reg);
 
         /* Set the external interrupt to pointed trigger type */
         switch (type)
@@ -208,9 +208,9 @@ static int s3c_irqext_type_set(void __iomem *gpcon_reg,
                         return -EINVAL;
         }
 
-        value = __raw_readl(extint_reg);
+        value = readl_relaxed(extint_reg);
         value = (value & ~(7 << extint_offset)) | (newvalue << extint_offset);
-        __raw_writel(value, extint_reg);
+        writel_relaxed(value, extint_reg);
 
         return 0;
 }
@@ -315,8 +315,8 @@ static void s3c_irq_demux(struct irq_desc *desc)
 
         chained_irq_enter(chip, desc);
 
-        src = __raw_readl(sub_intc->reg_pending);
-        msk = __raw_readl(sub_intc->reg_mask);
+        src = readl_relaxed(sub_intc->reg_pending);
+        msk = readl_relaxed(sub_intc->reg_mask);
 
         src &= ~msk;
         src &= irq_data->sub_bits;
@@ -337,7 +337,7 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc,
         int pnd;
         int offset;
 
-        pnd = __raw_readl(intc->reg_intpnd);
+        pnd = readl_relaxed(intc->reg_intpnd);
         if (!pnd)
                 return false;
 
@@ -352,7 +352,7 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc,
          *
          * Thanks to Klaus, Shannon, et al for helping to debug this problem
          */
-        offset = __raw_readl(intc->reg_intpnd + 4);
+        offset = readl_relaxed(intc->reg_intpnd + 4);
 
         /* Find the bit manually, when the offset is wrong.
          * The pending register only ever contains the one bit of the next
@@ -406,7 +406,7 @@ int s3c24xx_set_fiq(unsigned int irq, bool on)
                 intmod = 0;
         }
 
-        __raw_writel(intmod, S3C2410_INTMOD);
+        writel_relaxed(intmod, S3C2410_INTMOD);
         return 0;
 }
 
@@ -508,14 +508,14 @@ static void s3c24xx_clear_intc(struct s3c_irq_intc *intc)
 
         last = 0;
         for (i = 0; i < 4; i++) {
-                pend = __raw_readl(reg_source);
+                pend = readl_relaxed(reg_source);
 
                 if (pend == 0 || pend == last)
                         break;
 
-                __raw_writel(pend, intc->reg_pending);
+                writel_relaxed(pend, intc->reg_pending);
                 if (intc->reg_intpnd)
-                        __raw_writel(pend, intc->reg_intpnd);
+                        writel_relaxed(pend, intc->reg_intpnd);
 
                 pr_info("irq: clearing pending status %08x\n", (int)pend);
                 last = pend;
diff --git a/drivers/irqchip/irq-sirfsoc.c b/drivers/irqchip/irq-sirfsoc.c
index 10cb21b9ba3d..e1336848affa 100644
--- a/drivers/irqchip/irq-sirfsoc.c
+++ b/drivers/irqchip/irq-sirfsoc.c
@@ -29,6 +29,11 @@
 
 static struct irq_domain *sirfsoc_irqdomain;
 
+static void __iomem *sirfsoc_irq_get_regbase(void)
+{
+        return (void __iomem __force *)sirfsoc_irqdomain->host_data;
+}
+
 static __init void sirfsoc_alloc_gc(void __iomem *base)
 {
         unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
@@ -53,7 +58,7 @@ static __init void sirfsoc_alloc_gc(void __iomem *base)
 
 static void __exception_irq_entry sirfsoc_handle_irq(struct pt_regs *regs)
 {
-        void __iomem *base = sirfsoc_irqdomain->host_data;
+        void __iomem *base = sirfsoc_irq_get_regbase();
         u32 irqstat;
 
         irqstat = readl_relaxed(base + SIRFSOC_INIT_IRQ_ID);
@@ -94,7 +99,7 @@ static struct sirfsoc_irq_status sirfsoc_irq_st;
 
 static int sirfsoc_irq_suspend(void)
 {
-        void __iomem *base = sirfsoc_irqdomain->host_data;
+        void __iomem *base = sirfsoc_irq_get_regbase();
 
         sirfsoc_irq_st.mask0 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK0);
         sirfsoc_irq_st.mask1 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK1);
@@ -106,7 +111,7 @@ static int sirfsoc_irq_suspend(void)
 
 static void sirfsoc_irq_resume(void)
 {
-        void __iomem *base = sirfsoc_irqdomain->host_data;
+        void __iomem *base = sirfsoc_irq_get_regbase();
 
         writel_relaxed(sirfsoc_irq_st.mask0, base + SIRFSOC_INT_RISC_MASK0);
         writel_relaxed(sirfsoc_irq_st.mask1, base + SIRFSOC_INT_RISC_MASK1);
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c
index e902f081e16c..3973a14bb15b 100644
--- a/drivers/irqchip/irq-tegra.c
+++ b/drivers/irqchip/irq-tegra.c
@@ -90,7 +90,7 @@ static struct tegra_ictlr_info *lic;
 
 static inline void tegra_ictlr_write_mask(struct irq_data *d, unsigned long reg)
 {
-        void __iomem *base = d->chip_data;
+        void __iomem *base = (void __iomem __force *)d->chip_data;
         u32 mask;
 
         mask = BIT(d->hwirq % 32);
@@ -266,7 +266,7 @@ static int tegra_ictlr_domain_alloc(struct irq_domain *domain,
 
                 irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i,
                                               &tegra_ictlr_chip,
-                                              info->base[ictlr]);
+                                              (void __force *)info->base[ictlr]);
         }
 
         parent_fwspec = *fwspec;
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c
index b956dfffe78c..f811a7de5857 100644
--- a/drivers/irqchip/irq-vic.c
+++ b/drivers/irqchip/irq-vic.c
@@ -167,7 +167,7 @@ static int vic_suspend(void)
         return 0;
 }
 
-struct syscore_ops vic_syscore_ops = {
+static struct syscore_ops vic_syscore_ops = {
         .suspend        = vic_suspend,
         .resume         = vic_resume,
 };
@@ -517,7 +517,8 @@ int __init vic_init_cascaded(void __iomem *base, unsigned int parent_irq,
 EXPORT_SYMBOL_GPL(vic_init_cascaded);
 
 #ifdef CONFIG_OF
-int __init vic_of_init(struct device_node *node, struct device_node *parent)
+static int __init vic_of_init(struct device_node *node,
+                              struct device_node *parent)
 {
         void __iomem *regs;
         u32 interrupt_mask = ~0;