* Re: [PATCH] mfd: Convert jz4740-adc to new irq_ methods
[not found] ` <4D03CE07.4050100@metafoo.de>
@ 2010-12-12 11:46 ` Mark Brown
2010-12-12 11:46 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2010-12-12 11:46 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Samuel Ortiz, linux-kernel, Paul Mundt
On Sat, Dec 11, 2010 at 08:16:23PM +0100, Lars-Peter Clausen wrote:
> > - 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 :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] mfd: Convert jz4740-adc to new irq_ methods
[not found] ` <4D03CE07.4050100@metafoo.de>
2010-12-12 11:46 ` [PATCH] mfd: Convert jz4740-adc to new irq_ methods Mark Brown
@ 2010-12-12 11:46 ` Mark Brown
2010-12-12 16:36 ` Lars-Peter Clausen
2010-12-12 16:40 ` Lars-Peter Clausen
1 sibling, 2 replies; 6+ messages in thread
From: Mark Brown @ 2010-12-12 11:46 UTC (permalink / raw)
To: Lars-Peter Clausen, Samuel Ortiz; +Cc: linux-kernel, Paul Mundt, Mark Brown
Convert the jz4740-adc driver to use the recently introduced IRQ API
variants which are passed struct irq_data rather than an IRQ number.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/mfd/jz4740-adc.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 9dd1b33..7188c06 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -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)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] mfd: Convert jz4740-adc to new irq_ methods
2010-12-12 11:46 ` Mark Brown
@ 2010-12-12 16:36 ` Lars-Peter Clausen
2010-12-12 16:40 ` Lars-Peter Clausen
1 sibling, 0 replies; 6+ messages in thread
From: Lars-Peter Clausen @ 2010-12-12 16:36 UTC (permalink / raw)
To: Mark Brown; +Cc: Samuel Ortiz, linux-kernel, Paul Mundt
On 12/12/2010 12:46 PM, Mark Brown wrote:
> Convert the jz4740-adc driver to use the recently introduced IRQ API
> variants which are passed struct irq_data rather than an IRQ number.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/jz4740-adc.c | 24 ++++++++++++------------
> 1 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
> index 9dd1b33..7188c06 100644
> --- a/drivers/mfd/jz4740-adc.c
> +++ b/drivers/mfd/jz4740-adc.c
> @@ -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;
data->irq is decremented now each time an irq is acked
> writeb(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.
> }
>
> 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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] mfd: Convert jz4740-adc to new irq_ methods
2010-12-12 11:46 ` Mark Brown
2010-12-12 16:36 ` Lars-Peter Clausen
@ 2010-12-12 16:40 ` Lars-Peter Clausen
2010-12-12 18:45 ` Mark Brown
2010-12-12 19:08 ` [PATCH v2] " Lars-Peter Clausen
1 sibling, 2 replies; 6+ messages in thread
From: Lars-Peter Clausen @ 2010-12-12 16:40 UTC (permalink / raw)
To: Samuel Ortiz, Mark Brown
Cc: lethal, linux-kernel, Mark Brown, Lars-Peter Clausen
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Convert the jz4740-adc driver to use the recently introduced IRQ API
variants which are passed struct irq_data rather than an IRQ number.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/mfd/jz4740-adc.c | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 3a3037b..0ab1879 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -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)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] mfd: Convert jz4740-adc to new irq_ methods
2010-12-12 16:40 ` Lars-Peter Clausen
@ 2010-12-12 18:45 ` Mark Brown
2010-12-12 19:08 ` [PATCH v2] " Lars-Peter Clausen
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2010-12-12 18:45 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Samuel Ortiz, lethal, linux-kernel
On Sun, Dec 12, 2010 at 05:40:32PM +0100, Lars-Peter Clausen wrote:
> From: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
> Convert the jz4740-adc driver to use the recently introduced IRQ API
> variants which are passed struct irq_data rather 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).
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] mfd: Convert jz4740-adc to new irq_ methods
2010-12-12 16:40 ` Lars-Peter Clausen
2010-12-12 18:45 ` Mark Brown
@ 2010-12-12 19:08 ` Lars-Peter Clausen
1 sibling, 0 replies; 6+ messages in thread
From: Lars-Peter Clausen @ 2010-12-12 19:08 UTC (permalink / raw)
To: Samuel Ortiz, Mark Brown
Cc: lethal, linux-kernel, Mark Brown, Lars-Peter Clausen
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Convert the jz4740-adc driver to use the recently introduced IRQ API
variants which are passed struct irq_data rather than an IRQ number.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/mfd/jz4740-adc.c | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 9dd1b33..0cc5979 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -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)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-12-12 19:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1292090258-7858-1-git-send-email-broonie@opensource.wolfsonmicro.com>
[not found] ` <4D03CE07.4050100@metafoo.de>
2010-12-12 11:46 ` [PATCH] mfd: Convert jz4740-adc to new irq_ methods Mark Brown
2010-12-12 11:46 ` Mark Brown
2010-12-12 16:36 ` Lars-Peter Clausen
2010-12-12 16:40 ` Lars-Peter Clausen
2010-12-12 18:45 ` Mark Brown
2010-12-12 19:08 ` [PATCH v2] " Lars-Peter Clausen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox