powerpc/irq: Stop exporting irq_map

First step in eliminating irq_map[] table entirely

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

4 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c
index b03d348b19a..76e87245bbf 100644
--- a/arch/powerpc/sysdev/xics/icp-hv.c
+++ b/arch/powerpc/sysdev/xics/icp-hv.c
@@ -58,7 +58,7 @@ static inline void icp_hv_set_qirr(int n_cpu , u8 value)
 
 static void icp_hv_eoi(struct irq_data *d)
 {
-        unsigned int hw_irq = (unsigned int)irq_data_to_hw(d);
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
 
         iosync();
         icp_hv_set_xirr((xics_pop_cppr() << 24) | hw_irq);
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index be5e3d748ed..d9e0515592c 100644
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -80,7 +80,7 @@ static void icp_native_set_cpu_priority(unsigned char cppr)
 
 static void icp_native_eoi(struct irq_data *d)
 {
-        unsigned int hw_irq = (unsigned int)irq_data_to_hw(d);
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
 
         iosync();
         icp_native_set_xirr((xics_pop_cppr() << 24) | hw_irq);
diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
index 610c148fedc..c782f85cf7e 100644
--- a/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -38,7 +38,7 @@ static struct ics ics_rtas = {
 
 static void ics_rtas_unmask_irq(struct irq_data *d)
 {
-        unsigned int hw_irq = (unsigned int)irq_data_to_hw(d);
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
         int call_status;
         int server;
 
@@ -109,7 +109,7 @@ static void ics_rtas_mask_real_irq(unsigned int hw_irq)
 
 static void ics_rtas_mask_irq(struct irq_data *d)
 {
-        unsigned int hw_irq = (unsigned int)irq_data_to_hw(d);
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
 
         pr_devel("xics: mask virq %d [hw 0x%x]\n", d->irq, hw_irq);
 
@@ -122,7 +122,7 @@ static int ics_rtas_set_affinity(struct irq_data *d,
                                  const struct cpumask *cpumask,
                                  bool force)
 {
-        unsigned int hw_irq = (unsigned int)irq_data_to_hw(d);
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
         int status;
         int xics_status[2];
         int irq_server;
@@ -171,7 +171,7 @@ static struct irq_chip ics_rtas_irq_chip = {
 
 static int ics_rtas_map(struct ics *ics, unsigned int virq)
 {
-        unsigned int hw_irq = (unsigned int)irq_map[virq].hwirq;
+        unsigned int hw_irq = (unsigned int)virq_to_hw(virq);
         int status[2];
         int rc;
 
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index c58844d7242..a0576b705dd 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -240,9 +240,9 @@ void xics_migrate_irqs_away(void)
                 /* We can't set affinity on ISA interrupts */
                 if (virq < NUM_ISA_INTERRUPTS)
                         continue;
-                if (irq_map[virq].host != xics_host)
+                if (virq_to_host(virq) != xics_host)
                         continue;
-                irq = (unsigned int)irq_map[virq].hwirq;
+                irq = (unsigned int)virq_to_hw(virq);
                 /* We need to get IPIs still. */
                 if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
                         continue;