diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-11 13:21:21 (GMT) |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-14 11:38:10 (GMT) |
commit | 25a947f805b4132b69f2561589e17a0fe45552b6 (patch) | |
tree | 265221712f0b26bd67a2a4ad059aecbbe08637d9 /drivers | |
parent | 845aeab5f1e0ef1a85b618a1bf917520a62a9c02 (diff) | |
download | linux-fsl-qoriq-25a947f805b4132b69f2561589e17a0fe45552b6.tar.xz |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/wm831x-irq.c | 10 | ||||
-rw-r--r-- | drivers/mfd/wm8350-irq.c | 8 | ||||
-rw-r--r-- | drivers/mfd/wm8994-irq.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c index eae5272..ee88f6a 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; diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c index ba966ae..5839966 100644 --- a/drivers/mfd/wm8350-irq.c +++ b/drivers/mfd/wm8350-irq.c @@ -419,14 +419,14 @@ static irqreturn_t wm8350_irq(int irq, void *irq_data) static void wm8350_irq_lock(struct irq_data *data) { - struct wm8350 *wm8350 = data->chip_data; + struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data); mutex_lock(&wm8350->irq_lock); } static void wm8350_irq_sync_unlock(struct irq_data *data) { - struct wm8350 *wm8350 = data->chip_data; + struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data); int i; for (i = 0; i < ARRAY_SIZE(wm8350->irq_masks); i++) { @@ -444,7 +444,7 @@ static void wm8350_irq_sync_unlock(struct irq_data *data) static void wm8350_irq_enable(struct irq_data *data) { - struct wm8350 *wm8350 = data->chip_data; + struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data); struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350, data->irq); @@ -453,7 +453,7 @@ static void wm8350_irq_enable(struct irq_data *data) static void wm8350_irq_disable(struct irq_data *data) { - struct wm8350 *wm8350 = data->chip_data; + struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data); struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350, data->irq); diff --git a/drivers/mfd/wm8994-irq.c b/drivers/mfd/wm8994-irq.c index 6259884..29e8faf 100644 --- a/drivers/mfd/wm8994-irq.c +++ b/drivers/mfd/wm8994-irq.c @@ -158,14 +158,14 @@ static inline struct wm8994_irq_data *irq_to_wm8994_irq(struct wm8994 *wm8994, static void wm8994_irq_lock(struct irq_data *data) { - struct wm8994 *wm8994 = data->chip_data; + struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data); mutex_lock(&wm8994->irq_lock); } static void wm8994_irq_sync_unlock(struct irq_data *data) { - struct wm8994 *wm8994 = data->chip_data; + struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data); int i; for (i = 0; i < ARRAY_SIZE(wm8994->irq_masks_cur); i++) { @@ -184,7 +184,7 @@ static void wm8994_irq_sync_unlock(struct irq_data *data) static void wm8994_irq_unmask(struct irq_data *data) { - struct wm8994 *wm8994 = data->chip_data; + struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data); struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994, data->irq); @@ -193,7 +193,7 @@ static void wm8994_irq_unmask(struct irq_data *data) static void wm8994_irq_mask(struct irq_data *data) { - struct wm8994 *wm8994 = data->chip_data; + struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data); struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994, data->irq); |