diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2009-10-13 15:44:51 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-10-30 02:20:55 -0400 |
commit | 6cff46f4bc6cc4a8a4154b0b6a2e669db08e8fd2 (patch) | |
tree | cdd88dcd639968abe5b0f5ff7b06dc230ec790b1 /arch/powerpc/platforms/pseries | |
parent | 59e3f837023d446924791f76fbdd4bcf8e09efcc (diff) |
powerpc: Remove get_irq_desc()
get_irq_desc() is a powerpc-specific version of irq_to_desc(). That
is reason enough to remove it, but it also doesn't know about sparse
irq_desc support which irq_to_desc() does (when we enable it).
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 419f8a637ffe..75935ae1a941 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -156,7 +156,7 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check) | |||
156 | cpumask_t cpumask; | 156 | cpumask_t cpumask; |
157 | cpumask_t tmp = CPU_MASK_NONE; | 157 | cpumask_t tmp = CPU_MASK_NONE; |
158 | 158 | ||
159 | cpumask_copy(&cpumask, irq_desc[virq].affinity); | 159 | cpumask_copy(&cpumask, irq_to_desc(virq)->affinity); |
160 | if (!distribute_irqs) | 160 | if (!distribute_irqs) |
161 | return default_server; | 161 | return default_server; |
162 | 162 | ||
@@ -419,7 +419,7 @@ static int xics_host_map(struct irq_host *h, unsigned int virq, | |||
419 | /* Insert the interrupt mapping into the radix tree for fast lookup */ | 419 | /* Insert the interrupt mapping into the radix tree for fast lookup */ |
420 | irq_radix_revmap_insert(xics_host, virq, hw); | 420 | irq_radix_revmap_insert(xics_host, virq, hw); |
421 | 421 | ||
422 | get_irq_desc(virq)->status |= IRQ_LEVEL; | 422 | irq_to_desc(virq)->status |= IRQ_LEVEL; |
423 | set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq); | 423 | set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq); |
424 | return 0; | 424 | return 0; |
425 | } | 425 | } |
@@ -843,7 +843,7 @@ void xics_migrate_irqs_away(void) | |||
843 | /* We need to get IPIs still. */ | 843 | /* We need to get IPIs still. */ |
844 | if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) | 844 | if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) |
845 | continue; | 845 | continue; |
846 | desc = get_irq_desc(virq); | 846 | desc = irq_to_desc(virq); |
847 | 847 | ||
848 | /* We only need to migrate enabled IRQS */ | 848 | /* We only need to migrate enabled IRQS */ |
849 | if (desc == NULL || desc->chip == NULL | 849 | if (desc == NULL || desc->chip == NULL |
@@ -872,7 +872,7 @@ void xics_migrate_irqs_away(void) | |||
872 | virq, cpu); | 872 | virq, cpu); |
873 | 873 | ||
874 | /* Reset affinity to all cpus */ | 874 | /* Reset affinity to all cpus */ |
875 | cpumask_setall(irq_desc[virq].affinity); | 875 | cpumask_setall(irq_to_desc(virq)->affinity); |
876 | desc->chip->set_affinity(virq, cpu_all_mask); | 876 | desc->chip->set_affinity(virq, cpu_all_mask); |
877 | unlock: | 877 | unlock: |
878 | spin_unlock_irqrestore(&desc->lock, flags); | 878 | spin_unlock_irqrestore(&desc->lock, flags); |