1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 0e998dc4e7d..58cc5fdde01 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -517,7 +517,6 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,
                             struct max8925_platform_data *pdata)
 {
         unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
-        struct irq_desc *desc;
         int i, ret;
         int __irq;
 
@@ -544,19 +543,18 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,
         mutex_init(&chip->irq_lock);
         chip->core_irq = irq;
         chip->irq_base = pdata->irq_base;
-        desc = irq_to_desc(chip->core_irq);
 
         /* register with genirq */
         for (i = 0; i < ARRAY_SIZE(max8925_irqs); i++) {
                 __irq = i + chip->irq_base;
-                set_irq_chip_data(__irq, chip);
-                set_irq_chip_and_handler(__irq, &max8925_irq_chip,
+                irq_set_chip_data(__irq, chip);
+                irq_set_chip_and_handler(__irq, &max8925_irq_chip,
                                          handle_edge_irq);
-                set_irq_nested_thread(__irq, 1);
+                irq_set_nested_thread(__irq, 1);
 #ifdef CONFIG_ARM
                 set_irq_flags(__irq, IRQF_VALID);
 #else
-                set_irq_noprobe(__irq);
+                irq_set_noprobe(__irq);
 #endif
         }
         if (!irq) {