Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25a947f8 authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 845aeab5

drivers/mfd/wm831x-irq.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

drivers/mfd/wm8350-irq.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/mfd/wm8994-irq.c

+4 −4
Original line number Diff line number Diff line
@@ -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);