[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110908145210.GB5793@suse.de>
Date: Thu, 8 Sep 2011 07:52:10 -0700
From: Greg KH <gregkh@...e.de>
To: Yong Zhang <yong.zhang0@...il.com>
Cc: Marc Dietich <marvin24@....de>, linux-kernel@...r.kernel.org,
tglx@...utronix.de, mingo@...e.hu,
Jarod Wilson <jarod@...sonet.com>,
Mauro Carvalho Chehab <mchehab@...hat.com>,
Namhyung Kim <namhyung@...il.com>,
Palash Bandyopadhyay <palash.bandyopadhyay@...exant.com>,
Joe Perches <joe@...ches.com>,
Ruslan Pisarev <ruslan@...sarev.org.ua>,
Ilia Mirkin <imirkin@...m.mit.edu>,
Hans Verkuil <hverkuil@...all.nl>,
Bob Beers <bbeers@...il.com>,
Ralph Loader <suckfish@...g.co.nz>, Tejun Heo <tj@...nel.org>,
Greg Dietsche <gregory.dietsche@....edu>,
Jiri Kosina <jkosina@...e.cz>,
Vitaliy Ivanov <vitalivanov@...il.com>,
devel@...verdev.osuosl.org
Subject: Re: [PATCH 25/62] staging: irq: Remove IRQF_DISABLED
On Thu, Sep 08, 2011 at 09:58:54PM +0800, Yong Zhang wrote:
> On Thu, Sep 08, 2011 at 12:40:48PM +0200, Marc Dietich wrote:
> > > This flag is a NOOP and can be removed now.
> > >
> > > Signed-off-by: Yong Zhang <yong.zhang0@...il.com>
> > > ---
> > > drivers/staging/cx25821/cx25821-alsa.c | 2 +-
> > > drivers/staging/cx25821/cx25821-audio-upstream.c | 2 +-
> > > drivers/staging/cx25821/cx25821-core.c | 2 +-
> > > .../staging/cx25821/cx25821-video-upstream-ch2.c | 2 +-
> > > drivers/staging/cx25821/cx25821-video-upstream.c | 2 +-
> > > drivers/staging/cxt1e1/linux.c | 6 ------
> > > drivers/staging/lirc/lirc_serial.c | 2 +-
> > > drivers/staging/lirc/lirc_sir.c | 2 +-
> > > drivers/staging/nvec/nvec.c | 2 +-
> > > 9 files changed, 8 insertions(+), 14 deletions(-)
> > >
> > > [...]
> > >
> > > diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
> > > index 72258e8..6210c95 100644
> > > --- a/drivers/staging/nvec/nvec.c
> > > +++ b/drivers/staging/nvec/nvec.c
> > > @@ -339,7 +339,7 @@ static int __devinit tegra_nvec_probe(struct
> > > platform_device *pdev)
> > >
> > > tegra_init_i2c_slave(pdata, i2c_regs, i2c_clk);
> > >
> > > - err = request_irq(nvec->irq, i2c_interrupt, IRQF_DISABLED, "nvec", nvec);
> > > + err = request_irq(nvec->irq, i2c_interrupt, 0, "nvec", nvec);
> > > if(err) {
> > > dev_err(nvec->dev, "couldn't request irq");
> > > goto failed;
> >
> > This is already fixed in
> > http://driverdev.linuxdriverproject.org/pipermail/devel/2011-August/018960.html
> > which went into the staging tree (which is currently not available).
>
> Thanks for pointing it out.
>
> IMHO, the conflict is easy to fix. And if necessary, I could send a new
> version :)
I'll try to work it out, and if I have problems, I'll ask for a new
version once linux-next gets back up and running.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists