powerpc/irq: Stop exporting irq_map

First step in eliminating irq_map[] table entirely

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

1 files changed, 13 insertions, 15 deletions

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f91c065bed5a..824a94fc413b 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -607,8 +607,6 @@ static int irq_choose_cpu(const struct cpumask *mask)
 }
 #endif
 
-#define mpic_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
 /* Find an mpic associated with a given linux interrupt */
 static struct mpic *mpic_find(unsigned int irq)
 {
@@ -621,7 +619,7 @@ static struct mpic *mpic_find(unsigned int irq)
 /* Determine if the linux irq is an IPI */
 static unsigned int mpic_is_ipi(struct mpic *mpic, unsigned int irq)
 {
-        unsigned int src = mpic_irq_to_hw(irq);
+        unsigned int src = virq_to_hw(irq);
 
         return (src >= mpic->ipi_vecs[0] && src <= mpic->ipi_vecs[3]);
 }
@@ -674,7 +672,7 @@ void mpic_unmask_irq(struct irq_data *d)
 {
         unsigned int loops = 100000;
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         DBG("%p: %s: enable_irq: %d (src %d)\n", mpic, mpic->name, d->irq, src);
 
@@ -695,7 +693,7 @@ void mpic_mask_irq(struct irq_data *d)
 {
         unsigned int loops = 100000;
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         DBG("%s: disable_irq: %d (src %d)\n", mpic->name, d->irq, src);
 
@@ -733,7 +731,7 @@ void mpic_end_irq(struct irq_data *d)
 static void mpic_unmask_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         mpic_unmask_irq(d);
 
@@ -744,7 +742,7 @@ static void mpic_unmask_ht_irq(struct irq_data *d)
 static unsigned int mpic_startup_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         mpic_unmask_irq(d);
         mpic_startup_ht_interrupt(mpic, src, irqd_is_level_type(d));
@@ -755,7 +753,7 @@ static unsigned int mpic_startup_ht_irq(struct irq_data *d)
 static void mpic_shutdown_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         mpic_shutdown_ht_interrupt(mpic, src);
         mpic_mask_irq(d);
@@ -764,7 +762,7 @@ static void mpic_shutdown_ht_irq(struct irq_data *d)
 static void mpic_end_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
 #ifdef DEBUG_IRQ
         DBG("%s: end_irq: %d\n", mpic->name, d->irq);
@@ -785,7 +783,7 @@ static void mpic_end_ht_irq(struct irq_data *d)
 static void mpic_unmask_ipi(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_ipi(d);
-        unsigned int src = mpic_irq_to_hw(d->irq) - mpic->ipi_vecs[0];
+        unsigned int src = virq_to_hw(d->irq) - mpic->ipi_vecs[0];
 
         DBG("%s: enable_ipi: %d (ipi %d)\n", mpic->name, d->irq, src);
         mpic_ipi_write(src, mpic_ipi_read(src) & ~MPIC_VECPRI_MASK);
@@ -816,7 +814,7 @@ int mpic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
                       bool force)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         if (mpic->flags & MPIC_SINGLE_DEST_CPU) {
                 int cpuid = irq_choose_cpu(cpumask);
@@ -862,7 +860,7 @@ static unsigned int mpic_type_to_vecpri(struct mpic *mpic, unsigned int type)
 int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned int vecpri, vold, vnew;
 
         DBG("mpic: set_irq_type(mpic:@%p,virq:%d,src:0x%x,type:0x%x)\n",
@@ -898,7 +896,7 @@ int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 void mpic_set_vector(unsigned int virq, unsigned int vector)
 {
         struct mpic *mpic = mpic_from_irq(virq);
-        unsigned int src = mpic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
         unsigned int vecpri;
 
         DBG("mpic: set_vector(mpic:@%p,virq:%d,src:%d,vector:0x%x)\n",
@@ -916,7 +914,7 @@ void mpic_set_vector(unsigned int virq, unsigned int vector)
 void mpic_set_destination(unsigned int virq, unsigned int cpuid)
 {
         struct mpic *mpic = mpic_from_irq(virq);
-        unsigned int src = mpic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
 
         DBG("mpic: set_destination(mpic:@%p,virq:%d,src:%d,cpuid:0x%x)\n",
             mpic, virq, src, cpuid);
@@ -1427,7 +1425,7 @@ void __init mpic_set_serial_int(struct mpic *mpic, int enable)
 void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
 {
         struct mpic *mpic = mpic_find(irq);
-        unsigned int src = mpic_irq_to_hw(irq);
+        unsigned int src = virq_to_hw(irq);
         unsigned long flags;
         u32 reg;