Michael Ellerman <m...@ellerman.id.au> writes: > We'd like to eventually remove NO_IRQ on powerpc, so remove usages of it > from electra_cf.c which is a powerpc-only driver. > > Signed-off-by: Michael Ellerman <m...@ellerman.id.au> > --- > drivers/pcmcia/electra_cf.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-)
Ping anyone? Or should I merge this via the powerpc tree? cheers > diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c > index 4d7bc3f4124a..c6fe2a4a7a6a 100644 > --- a/drivers/pcmcia/electra_cf.c > +++ b/drivers/pcmcia/electra_cf.c > @@ -207,7 +207,7 @@ static int electra_cf_probe(struct platform_device *ofdev) > return -ENOMEM; > > setup_timer(&cf->timer, electra_cf_timer, (unsigned long)cf); > - cf->irq = NO_IRQ; > + cf->irq = 0; > > cf->ofdev = ofdev; > cf->mem_phys = mem.start; > @@ -313,7 +313,7 @@ fail3: > fail2: > release_mem_region(cf->mem_phys, cf->mem_size); > fail1: > - if (cf->irq != NO_IRQ) > + if (cf->irq) > free_irq(cf->irq, cf); > > if (cf->io_virt) > -- > 2.7.4
