1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index cb3b4d228475..ecafa4ba238b 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -348,15 +348,15 @@ static unsigned long gru_chiplet_cpu_to_mmr(int chiplet, int cpu, int *corep)
 
 static int gru_irq_count[GRU_CHIPLETS_PER_BLADE];
 
-static void gru_noop(unsigned int irq)
+static void gru_noop(struct irq_data *d)
 {
 }
 
 static struct irq_chip gru_chip[GRU_CHIPLETS_PER_BLADE] = {
         [0 ... GRU_CHIPLETS_PER_BLADE - 1] {
-                .mask           = gru_noop,
-                .unmask         = gru_noop,
-                .ack            = gru_noop
+                .irq_mask       = gru_noop,
+                .irq_unmask     = gru_noop,
+                .irq_ack        = gru_noop
         }
 };
 
@@ -373,7 +373,7 @@ static int gru_chiplet_setup_tlb_irq(int chiplet, char *irq_name,
 
         if (gru_irq_count[chiplet] == 0) {
                 gru_chip[chiplet].name = irq_name;
-                ret = set_irq_chip(irq, &gru_chip[chiplet]);
+                ret = irq_set_chip(irq, &gru_chip[chiplet]);
                 if (ret) {
                         printk(KERN_ERR "%s: set_irq_chip failed, errno=%d\n",
                                GRU_DRIVER_ID_STR, -ret);
@@ -587,6 +587,7 @@ static const struct file_operations gru_fops = {
         .owner          = THIS_MODULE,
         .unlocked_ioctl = gru_file_unlocked_ioctl,
         .mmap           = gru_file_mmap,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice gru_miscdev = {