lkml.org 
[lkml]   [2010]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the mfd tree with the ux500-core tree
On Mon, Dec 20, 2010 at 01:23:44PM +0900, Paul Mundt wrote:
> On Mon, Dec 20, 2010 at 03:21:48PM +1100, Stephen Rothwell wrote:
> > The genirq core is being converted to pass struct irq_data to irq_chip
> > operations rather than an IRQ number. Update the tc35892 driver to the
> > new APIs.
> >
> > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
> > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
>
> Sorry to hijack the thread..
>
> > diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
> > index 32291fe..dde2d858 100644
> > --- a/drivers/mfd/tc3589x.c
> > +++ b/drivers/mfd/tc3589x.c
> > @@ -170,15 +170,15 @@ again:
> > return IRQ_HANDLED;
> > }
> >
> > -static void tc3589x_irq_dummy(unsigned int irq)
> > +static void tc3589x_irq_dummy(struct irq_data *data)
> > {
> > /* No mask/unmask at this level */
> > }
> >
> > static struct irq_chip tc3589x_irq_chip = {
> > - .name = "tc3589x",
> > - .mask = tc3589x_irq_dummy,
> > - .unmask = tc3589x_irq_dummy,
> > + .name = "tc3589x",
> > + .irq_mask = tc3589x_irq_dummy,
> > + .irq_unmask = tc3589x_irq_dummy,
> > };
> >
> > static int tc3589x_irq_init(struct tc3589x *tc3589x)
>
> Is there some reason you don't just kill this off and use dummy_irq_chip?
Good point.
I removed this patch from my branch and sent a fix to LinusW so that he
carries it from his ux500-core branch.

Cheers,
Samuel.

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


\
 
 \ /
  Last update: 2010-12-20 13:11    [W:0.043 / U:0.524 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site