diff options
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/flipper-pic.c')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/flipper-pic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c index 12aa62b6f227..77cbe4c8f953 100644 --- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c +++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | static void flipper_pic_mask_and_ack(struct irq_data *d) | 49 | static void flipper_pic_mask_and_ack(struct irq_data *d) |
50 | { | 50 | { |
51 | int irq = virq_to_hw(d->irq); | 51 | int irq = irqd_to_hwirq(d); |
52 | void __iomem *io_base = irq_data_get_irq_chip_data(d); | 52 | void __iomem *io_base = irq_data_get_irq_chip_data(d); |
53 | u32 mask = 1 << irq; | 53 | u32 mask = 1 << irq; |
54 | 54 | ||
@@ -59,7 +59,7 @@ static void flipper_pic_mask_and_ack(struct irq_data *d) | |||
59 | 59 | ||
60 | static void flipper_pic_ack(struct irq_data *d) | 60 | static void flipper_pic_ack(struct irq_data *d) |
61 | { | 61 | { |
62 | int irq = virq_to_hw(d->irq); | 62 | int irq = irqd_to_hwirq(d); |
63 | void __iomem *io_base = irq_data_get_irq_chip_data(d); | 63 | void __iomem *io_base = irq_data_get_irq_chip_data(d); |
64 | 64 | ||
65 | /* this is at least needed for RSW */ | 65 | /* this is at least needed for RSW */ |
@@ -68,7 +68,7 @@ static void flipper_pic_ack(struct irq_data *d) | |||
68 | 68 | ||
69 | static void flipper_pic_mask(struct irq_data *d) | 69 | static void flipper_pic_mask(struct irq_data *d) |
70 | { | 70 | { |
71 | int irq = virq_to_hw(d->irq); | 71 | int irq = irqd_to_hwirq(d); |
72 | void __iomem *io_base = irq_data_get_irq_chip_data(d); | 72 | void __iomem *io_base = irq_data_get_irq_chip_data(d); |
73 | 73 | ||
74 | clrbits32(io_base + FLIPPER_IMR, 1 << irq); | 74 | clrbits32(io_base + FLIPPER_IMR, 1 << irq); |
@@ -76,7 +76,7 @@ static void flipper_pic_mask(struct irq_data *d) | |||
76 | 76 | ||
77 | static void flipper_pic_unmask(struct irq_data *d) | 77 | static void flipper_pic_unmask(struct irq_data *d) |
78 | { | 78 | { |
79 | int irq = virq_to_hw(d->irq); | 79 | int irq = irqd_to_hwirq(d); |
80 | void __iomem *io_base = irq_data_get_irq_chip_data(d); | 80 | void __iomem *io_base = irq_data_get_irq_chip_data(d); |
81 | 81 | ||
82 | setbits32(io_base + FLIPPER_IMR, 1 << irq); | 82 | setbits32(io_base + FLIPPER_IMR, 1 << irq); |