1 files changed, 21 insertions, 19 deletions

diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c
index f56c9adf9493..ed4b22a167b3 100644
--- a/drivers/mfd/wm8350-irq.c
+++ b/drivers/mfd/wm8350-irq.c
@@ -417,16 +417,16 @@ static irqreturn_t wm8350_irq(int irq, void *irq_data)
         return IRQ_HANDLED;
 }
 
-static void wm8350_irq_lock(unsigned int irq)
+static void wm8350_irq_lock(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&wm8350->irq_lock);
 }
 
-static void wm8350_irq_sync_unlock(unsigned int irq)
+static void wm8350_irq_sync_unlock(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(wm8350->irq_masks); i++) {
@@ -442,28 +442,30 @@ static void wm8350_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&wm8350->irq_lock);
 }
 
-static void wm8350_irq_enable(unsigned int irq)
+static void wm8350_irq_enable(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
-        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350, irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
+        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350,
+                                                             data->irq);
 
         wm8350->irq_masks[irq_data->reg] &= ~irq_data->mask;
 }
 
-static void wm8350_irq_disable(unsigned int irq)
+static void wm8350_irq_disable(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
-        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350, irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
+        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350,
+                                                             data->irq);
 
         wm8350->irq_masks[irq_data->reg] |= irq_data->mask;
 }
 
 static struct irq_chip wm8350_irq_chip = {
-        .name = "wm8350",
-        .bus_lock = wm8350_irq_lock,
-        .bus_sync_unlock = wm8350_irq_sync_unlock,
-        .disable = wm8350_irq_disable,
-        .enable = wm8350_irq_enable,
+        .name                   = "wm8350",
+        .irq_bus_lock           = wm8350_irq_lock,
+        .irq_bus_sync_unlock    = wm8350_irq_sync_unlock,
+        .irq_disable            = wm8350_irq_disable,
+        .irq_enable             = wm8350_irq_enable,
 };
 
 int wm8350_irq_init(struct wm8350 *wm8350, int irq,
@@ -516,17 +518,17 @@ int wm8350_irq_init(struct wm8350 *wm8350, int irq,
         for (cur_irq = wm8350->irq_base;
              cur_irq < ARRAY_SIZE(wm8350_irqs) + wm8350->irq_base;
              cur_irq++) {
-                set_irq_chip_data(cur_irq, wm8350);
-                set_irq_chip_and_handler(cur_irq, &wm8350_irq_chip,
+                irq_set_chip_data(cur_irq, wm8350);
+                irq_set_chip_and_handler(cur_irq, &wm8350_irq_chip,
                                          handle_edge_irq);
-                set_irq_nested_thread(cur_irq, 1);
+                irq_set_nested_thread(cur_irq, 1);
 
                 /* ARM needs us to explicitly flag the IRQ as valid
                  * and will set them noprobe when we do so. */
 #ifdef CONFIG_ARM
                 set_irq_flags(cur_irq, IRQF_VALID);
 #else
-                set_irq_noprobe(cur_irq);
+                irq_set_noprobe(cur_irq);
 #endif
         }