mfd: Convert Wolfson MFD drivers to use irq_data accessor function

Actually makes the code larger rathe rthan smaller but does provide some
isolation against core API changes.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
index eae52726bf3e..ee88f6a05cec 100644
--- a/drivers/mfd/wm831x-irq.c
+++ b/drivers/mfd/wm831x-irq.c
@@ -347,14 +347,14 @@ static inline struct wm831x_irq_data *irq_to_wm831x_irq(struct wm831x *wm831x,
 
 static void wm831x_irq_lock(struct irq_data *data)
 {
-        struct wm831x *wm831x = data->chip_data;
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&wm831x->irq_lock);
 }
 
 static void wm831x_irq_sync_unlock(struct irq_data *data)
 {
-        struct wm831x *wm831x = data->chip_data;
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(wm831x->irq_masks_cur); i++) {
@@ -373,7 +373,7 @@ static void wm831x_irq_sync_unlock(struct irq_data *data)
 
 static void wm831x_irq_unmask(struct irq_data *data)
 {
-        struct wm831x *wm831x = data->chip_data;
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
         struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x,
                                                              data->irq);
 
@@ -382,7 +382,7 @@ static void wm831x_irq_unmask(struct irq_data *data)
 
 static void wm831x_irq_mask(struct irq_data *data)
 {
-        struct wm831x *wm831x = data->chip_data;
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
         struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x,
                                                              data->irq);
 
@@ -391,7 +391,7 @@ static void wm831x_irq_mask(struct irq_data *data)
 
 static int wm831x_irq_set_type(struct irq_data *data, unsigned int type)
 {
-        struct wm831x *wm831x = data->chip_data;
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
         int val, irq;
 
         irq = data->irq - wm831x->irq_base;