2010-12-20 12:09:24

by Samuel Ortiz

Subject: [PATCH] mfd: Use dummy_irq_chip for tc3589x

This also converts tc3589x to the new irq API.

Signed-off-by: Samuel Ortiz <[email protected]>
---

Linus, this should go through your ux500-core branch as this is where the
tc3589x rename happens.

(Patch resent with Linus Walleij's correct email address)

---
drivers/mfd/tc3589x.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index 32291fe..112efd3 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -170,17 +170,6 @@ again:
return IRQ_HANDLED;
}

-static void tc3589x_irq_dummy(unsigned int irq)
-{
- /* No mask/unmask at this level */
-}
-
-static struct irq_chip tc3589x_irq_chip = {
- .name = "tc3589x",
- .mask = tc3589x_irq_dummy,
- .unmask = tc3589x_irq_dummy,
-};
-
static int tc3589x_irq_init(struct tc3589x *tc3589x)
{
int base = tc3589x->irq_base;
@@ -188,7 +177,7 @@ static int tc3589x_irq_init(struct tc3589x *tc3589x)

for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
set_irq_chip_data(irq, tc3589x);
- set_irq_chip_and_handler(irq, &tc3589x_irq_chip,
+ set_irq_chip_and_handler(irq, &dummy_irq_chip,
handle_edge_irq);
set_irq_nested_thread(irq, 1);
#ifdef CONFIG_ARM
--
1.7.2.3

--
Intel Open Source Technology Centre
http://oss.intel.com/

2010-12-20 12:36:27

by Linus Walleij

Subject: RE: [PATCH] mfd: Use dummy_irq_chip for tc3589x

[Samuel]

> This also converts tc3589x to the new irq API.
>
> Signed-off-by: Samuel Ortiz <[email protected]>
> ---
>
> Linus, this should go through your ux500-core branch as this is where
> the
> tc3589x rename happens.

OK applied and pushed to ux500-core, you can drop this
tc35x stuff off the MFD tree now..

Yours,
Linus Walleij

2010-12-20 13:11:22

by Samuel Ortiz

Subject: Re: [PATCH] mfd: Use dummy_irq_chip for tc3589x

On Mon, Dec 20, 2010 at 01:35:56PM +0100, Linus WALLEIJ wrote:
> [Samuel]
>
> > This also converts tc3589x to the new irq API.
> >
> > Signed-off-by: Samuel Ortiz <[email protected]>
> > ---
> >
> > Linus, this should go through your ux500-core branch as this is where
> > the
> > tc3589x rename happens.
>
> OK applied and pushed to ux500-core, you can drop this
> tc35x stuff off the MFD tree now..
Done, thanks a lot.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/