mfd: Convert WM831x to new irq_ interrupt methods
Subsystems (2)
PATCH 1/3 mfd: Convert WM831x to new irq_ interrupt methods
Kernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Convert over to these as they will become mandatory in future.
Signed-off-by Mark Brown <[email protected]>
--- drivers/mfd/wm831x-irq.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-)
drivers/mfd/wm831x-irq.c +22 -20
@@ -345,16 +345,16 @@ static inline struct wm831x_irq_data *irq_to_wm831x_irq(struct wm831x *wm831x,return &wm831x_irqs[irq - wm831x->irq_base]; } -static void wm831x_irq_lock (unsigned int irq) +static void wm831x_irq_lock (struct irq_data *data) { -struct wm831x *wm831x =get_irq_chip_data (irq); +struct wm831x *wm831x = data->chip_data;mutex_lock (&wm831x->irq_lock); } -static void wm831x_irq_sync_unlock (unsigned int irq) +static void wm831x_irq_sync_unlock (struct irq_data *data) { -struct wm831x *wm831x =get_irq_chip_data (irq); +struct wm831x *wm831x = data->chip_data;int i;for (i =0 ; i <ARRAY_SIZE (wm831x->irq_masks_cur); i++) {
@@ -371,28 +371,30 @@ static void wm831x_irq_sync_unlock(unsigned int irq)mutex_unlock (&wm831x->irq_lock); } -static void wm831x_irq_unmask (unsigned int irq) +static void wm831x_irq_unmask (struct irq_data *data) { -struct wm831x *wm831x =get_irq_chip_data (irq); -struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, irq); +struct wm831x *wm831x = data->chip_data; +struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, + data->irq); wm831x->irq_masks_cur[irq_data->reg -1 ] &= ~irq_data->mask; } -static void wm831x_irq_mask (unsigned int irq) +static void wm831x_irq_mask (struct irq_data *data) { -struct wm831x *wm831x =get_irq_chip_data (irq); -struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, irq); +struct wm831x *wm831x = data->chip_data; +struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, + data->irq); wm831x->irq_masks_cur[irq_data->reg -1 ] |= irq_data->mask; } -static int wm831x_irq_set_type (unsigned int irq,unsigned int type) +static int wm831x_irq_set_type (struct irq_data *data,unsigned int type) { -struct wm831x *wm831x =get_irq_chip_data (irq); -int val; +struct wm831x *wm831x = data->chip_data; +int val, irq; - irq = irq - wm831x->irq_base; + irq = data->irq - wm831x->irq_base;if (irq <WM831X_IRQ_GPIO_1 || irq >WM831X_IRQ_GPIO_11 ) {/* Ignore internal-only IRQs */
@@ -421,12 +423,12 @@ static int wm831x_irq_set_type(unsigned int irq, unsigned int type) }static struct irq_chip wm831x_irq_chip = { - .name ="wm831x" , - .bus_lock = wm831x_irq_lock, - .bus_sync_unlock = wm831x_irq_sync_unlock, - .mask = wm831x_irq_mask, - .unmask = wm831x_irq_unmask, - .set_type = wm831x_irq_set_type, + .name ="wm831x" , + .irq_bus_lock = wm831x_irq_lock, + .irq_bus_sync_unlock = wm831x_irq_sync_unlock, + .irq_mask = wm831x_irq_mask, + .irq_unmask = wm831x_irq_unmask, + .irq_set_type = wm831x_irq_set_type, };/* The processing of the primary interrupt occurs in a thread so that
Signature · 1 line
1.7.1
PATCH 2/3 mfd: Convert WM835x to new irq_ interrupt methods
Kernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Convert over to these as they will become mandatory in future.
Signed-off-by Mark Brown <[email protected]>
--- drivers/mfd/wm8350-irq.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-)
drivers/mfd/wm8350-irq.c +17 -15
@@ -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 = data->chip_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 = data->chip_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 = data->chip_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 = data->chip_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,
Signature · 1 line
1.7.1
PATCH 3/3 mfd: Convert WM8994 to new irq_ interrupt methods
In reply to Mark BrownKernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Convert over to these as they will become mandatory in future.
Signed-off-by Mark Brown <[email protected]>
--- drivers/mfd/wm8994-irq.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-)
drivers/mfd/wm8994-irq.c +17 -15
@@ -156,16 +156,16 @@ static inline struct wm8994_irq_data *irq_to_wm8994_irq(struct wm8994 *wm8994,return &wm8994_irqs[irq - wm8994->irq_base]; } -static void wm8994_irq_lock (unsigned int irq) +static void wm8994_irq_lock (struct irq_data *data) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); +struct wm8994 *wm8994 = data->chip_data;mutex_lock (&wm8994->irq_lock); } -static void wm8994_irq_sync_unlock (unsigned int irq) +static void wm8994_irq_sync_unlock (struct irq_data *data) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); +struct wm8994 *wm8994 = data->chip_data;int i;for (i =0 ; i <ARRAY_SIZE (wm8994->irq_masks_cur); i++) {
@@ -182,28 +182,30 @@ static void wm8994_irq_sync_unlock(unsigned int irq)mutex_unlock (&wm8994->irq_lock); } -static void wm8994_irq_unmask (unsigned int irq) +static void wm8994_irq_unmask (struct irq_data *data) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); -struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, irq); +struct wm8994 *wm8994 = data->chip_data; +struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, + data->irq); wm8994->irq_masks_cur[irq_data->reg -1 ] &= ~irq_data->mask; } -static void wm8994_irq_mask (unsigned int irq) +static void wm8994_irq_mask (struct irq_data *data) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); -struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, irq); +struct wm8994 *wm8994 = data->chip_data; +struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, + data->irq); wm8994->irq_masks_cur[irq_data->reg -1 ] |= irq_data->mask; }static struct irq_chip wm8994_irq_chip = { - .name ="wm8994" , - .bus_lock = wm8994_irq_lock, - .bus_sync_unlock = wm8994_irq_sync_unlock, - .mask = wm8994_irq_mask, - .unmask = wm8994_irq_unmask, + .name ="wm8994" , + .irq_bus_lock = wm8994_irq_lock, + .irq_bus_sync_unlock = wm8994_irq_sync_unlock, + .irq_mask = wm8994_irq_mask, + .irq_unmask = wm8994_irq_unmask, };/* The processing of the primary interrupt occurs in a thread so that
Signature · 1 line
1.7.1