1 files changed, 4 insertions, 11 deletions

diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index 12aa62b6f227..f61a2dd96b99 100644
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -48,7 +48,7 @@
 
 static void flipper_pic_mask_and_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
         u32 mask = 1 << irq;
 
@@ -59,7 +59,7 @@ static void flipper_pic_mask_and_ack(struct irq_data *d)
 
 static void flipper_pic_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         /* this is at least needed for RSW */
@@ -68,7 +68,7 @@ static void flipper_pic_ack(struct irq_data *d)
 
 static void flipper_pic_mask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         clrbits32(io_base + FLIPPER_IMR, 1 << irq);
@@ -76,7 +76,7 @@ static void flipper_pic_mask(struct irq_data *d)
 
 static void flipper_pic_unmask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         setbits32(io_base + FLIPPER_IMR, 1 << irq);
@@ -107,12 +107,6 @@ static int flipper_pic_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static void flipper_pic_unmap(struct irq_host *h, unsigned int irq)
-{
-        irq_set_chip_data(irq, NULL);
-        irq_set_chip(irq, NULL);
-}
-
 static int flipper_pic_match(struct irq_host *h, struct device_node *np)
 {
         return 1;
@@ -121,7 +115,6 @@ static int flipper_pic_match(struct irq_host *h, struct device_node *np)
 
 static struct irq_host_ops flipper_irq_host_ops = {
         .map = flipper_pic_map,
-        .unmap = flipper_pic_unmap,
         .match = flipper_pic_match,
 };