1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 3013c57f121..d9f51485bee 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -296,7 +296,7 @@ static struct pci_port_ops dino_port_ops = {
         .outl   = dino_out32
 };
 
-static void dino_disable_irq(unsigned int irq)
+static void dino_mask_irq(unsigned int irq)
 {
         struct dino_device *dino_dev = get_irq_chip_data(irq);
         int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
@@ -308,7 +308,7 @@ static void dino_disable_irq(unsigned int irq)
         __raw_writel(dino_dev->imr, dino_dev->hba.base_addr+DINO_IMR);
 }
 
-static void dino_enable_irq(unsigned int irq)
+static void dino_unmask_irq(unsigned int irq)
 {
         struct dino_device *dino_dev = get_irq_chip_data(irq);
         int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
@@ -345,20 +345,11 @@ static void dino_enable_irq(unsigned int irq)
         }
 }
 
-static unsigned int dino_startup_irq(unsigned int irq)
-{
-        dino_enable_irq(irq);
-        return 0;
-}
-
 static struct irq_chip dino_interrupt_type = {
-        .name           = "GSC-PCI",
-        .startup        = dino_startup_irq,
-        .shutdown       = dino_disable_irq,
-        .enable         = dino_enable_irq, 
-        .disable        = dino_disable_irq,
-        .ack            = no_ack_irq,
-        .end            = no_end_irq,
+        .name   = "GSC-PCI",
+        .unmask = dino_unmask_irq,
+        .mask   = dino_mask_irq,
+        .ack    = no_ack_irq,
 };