mfd: Convert jz4740-adc to new irq_ methods
A message that is not in the archive (sent off-list or not yet received): 1292090258-7858-1-git-send-email-broonie@opensource.wolfsonmicro.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 5 lines · Lars-Peter Clausen
Review
Quoted 2 lines
(quoted diff) +1
-1- irq -= adc->irq_base; + data->irqirq -= adc->irq_base;This should rather be:
unsigned int irq =data->irq-adc->irq_base;
Would be one of the ones I can't build that I did this on :)
PATCH 1/1 mfd: Convert jz4740-adc to new irq_ methods
In reply to a message not in the archiveConvert the jz4740-adc driver to use the recently introduced IRQ API variants which are passed struct irq_data rather than an IRQ number.
--- drivers/mfd/jz4740-adc.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/mfd/jz4740-adc.c +12 -12
@@ -84,31 +84,31 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,spin_unlock_irqrestore (&adc->lock, flags); } -static void jz4740_adc_irq_mask (unsigned int irq) +static void jz4740_adc_irq_mask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, true); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, true); } -static void jz4740_adc_irq_unmask (unsigned int irq) +static void jz4740_adc_irq_unmask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, false); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, false); } -static void jz4740_adc_irq_ack (unsigned int irq) +static void jz4740_adc_irq_ack (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); - irq -= adc->irq_base; + data->irq -= adc->irq_base;writeb (BIT (irq), adc->base +JZ_REG_ADC_STATUS ); }static struct irq_chip jz4740_adc_irq_chip = { .name ="jz4740-adc" , - .mask = jz4740_adc_irq_mask, - .unmask = jz4740_adc_irq_unmask, - .ack = jz4740_adc_irq_ack, + .irq_mask = jz4740_adc_irq_mask, + .irq_unmask = jz4740_adc_irq_unmask, + .irq_ack = jz4740_adc_irq_ack, };static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc)
Signature · 1 line
1.7.2.3
Quoted 32 lines · Mark Brown
Convert the jz4740-adc driver to use the recently introduced IRQ API variants which are passed struct
irq_datarather than an IRQ number.Signed-off-by Mark Brown <[email protected]>--- drivers/mfd/jz4740-adc.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)drivers/mfd/jz4740-adc.c +6
-6@@ -84,31 +84,31 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,spin_unlock_irqrestore (&adc->lock, flags); } -static void jz4740_adc_irq_mask (unsigned int irq) +static void jz4740_adc_irq_mask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, true); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, true); } -static void jz4740_adc_irq_unmask (unsigned int irq) +static void jz4740_adc_irq_unmask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, false); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, false);
drivers/mfd/jz4740-adc.c static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq, · line 103
Quoted 10 lines
drivers/mfd/jz4740-adc.c +3
-3} -static void jz4740_adc_irq_ack (unsigned int irq) +static void jz4740_adc_irq_ack (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); - irq -= adc->irq_base; + data->irq -= adc->irq_base;
data->irq is decremented now each time an irq is acked
drivers/mfd/jz4740-adc.c static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq, · line 104
Quoted 1 line
drivers/mfd/jz4740-adc.c +0
-0writeb (BIT (irq), adc->base +JZ_REG_ADC_STATUS );
And 'irq' is undefined.
I'll send a patch as reply which is compile and runtime tested.
Quoted 13 lines
drivers/mfd/jz4740-adc.c +3
-3}static struct irq_chip jz4740_adc_irq_chip = { .name ="jz4740-adc" , - .mask = jz4740_adc_irq_mask, - .unmask = jz4740_adc_irq_unmask, - .ack = jz4740_adc_irq_ack, + .irq_mask = jz4740_adc_irq_mask, + .irq_unmask = jz4740_adc_irq_unmask, + .irq_ack = jz4740_adc_irq_ack, };static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc)
PATCH 1/1 mfd: Convert jz4740-adc to new irq_ methods
In reply to Mark BrownFrom: Mark Brown <[email protected]>
Convert the jz4740-adc driver to use the recently introduced IRQ API variants which are passed struct irq_data rather than an IRQ number.
--- drivers/mfd/jz4740-adc.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-)
drivers/mfd/jz4740-adc.c +12 -13
@@ -84,32 +84,31 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,spin_unlock_irqrestore (&adc->lock, flags); } -static void jz4740_adc_irq_mask (unsigned int irq) +static void jz4740_adc_irq_mask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, true); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, true); } -static void jz4740_adc_irq_unmask (unsigned int irq) +static void jz4740_adc_irq_unmask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, false); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, false); } -static void jz4740_adc_irq_ack (unsigned int irq) +static void jz4740_adc_irq_ack (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); - - irq -= adc->irq_base; +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +unsigned int irq = data->irq - adc->irq_base;writeb (BIT (irq), adc->base +JZ_REG_ADC_STATUS ); }static struct irq_chip jz4740_adc_irq_chip = { .name ="jz4740-adc" , - .mask = jz4740_adc_irq_mask, - .unmask = jz4740_adc_irq_unmask, - .ack = jz4740_adc_irq_ack, + .irq_mask = jz4740_adc_irq_mask, + .irq_unmask = jz4740_adc_irq_unmask, + .irq_ack = jz4740_adc_irq_ack, };static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc)
Signature · 1 line
1.7.2.3
Quoted 4 lines · Lars-Peter Clausen
From: Mark Brown <[email protected]>
Convert the jz4740-adc driver to use the recently introduced IRQ API variants which are passed struct
irq_datarather than an IRQ number.
Hrm, what's that patch against? I tried to replace my version with this one but I'm unable to apply it against Samuel's tree, and git am can't find what you're patching in any of the trees in my repository (which includes -next).
PATCH v2 1/1 mfd: Convert jz4740-adc to new irq_ methods
In reply to Lars-Peter ClausenFrom: Mark Brown <[email protected]>
Convert the jz4740-adc driver to use the recently introduced IRQ API variants which are passed struct irq_data rather than an IRQ number.
--- drivers/mfd/jz4740-adc.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-)
drivers/mfd/jz4740-adc.c +12 -13
@@ -84,31 +84,30 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,spin_unlock_irqrestore (&adc->lock, flags); } -static void jz4740_adc_irq_mask (unsigned int irq) +static void jz4740_adc_irq_mask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, true); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, true); } -static void jz4740_adc_irq_unmask (unsigned int irq) +static void jz4740_adc_irq_unmask (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, false); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +jz4740_adc_irq_set_masked (adc, data->irq, false); } -static void jz4740_adc_irq_ack (unsigned int irq) +static void jz4740_adc_irq_ack (struct irq_data *data) { -struct jz4740_adc *adc =get_irq_chip_data (irq); - - irq -= adc->irq_base; +struct jz4740_adc *adc =irq_data_get_irq_chip_data (data); +unsigned int irq = data->irq - adc->irq_base;writeb (BIT (irq), adc->base +JZ_REG_ADC_STATUS ); }static struct irq_chip jz4740_adc_irq_chip = { .name ="jz4740-adc" , - .mask = jz4740_adc_irq_mask, - .unmask = jz4740_adc_irq_unmask, - .ack = jz4740_adc_irq_ack, + .irq_mask = jz4740_adc_irq_mask, + .irq_unmask = jz4740_adc_irq_unmask, + .irq_ack = jz4740_adc_irq_ack, };static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc)
Signature · 1 line
1.7.2.3