Messages in this thread | | | From | Grant Likely <> | Date | Wed, 14 Dec 2011 14:15:19 -0700 | Subject | Re: [PATCH 4/9] gpio: pl061: use chained_irq_* functions in irq handler |
| |
On Wed, Dec 14, 2011 at 8:28 AM, Rob Herring <robherring2@gmail.com> wrote: > From: Rob Herring <rob.herring@calxeda.com> > > Use chained_irq_enter/exit helper functions instead of direct pointer > accesses. This is needed for generic irq chip conversion. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> Cc: Linus Walleij <linus.ml.walleij@gmail.com> > --- > drivers/gpio/gpio-pl061.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c > index 4102f63..0f718f9 100644 > --- a/drivers/gpio/gpio-pl061.c > +++ b/drivers/gpio/gpio-pl061.c > @@ -23,6 +23,7 @@ > #include <linux/amba/bus.h> > #include <linux/amba/pl061.h> > #include <linux/slab.h> > +#include <asm/mach/irq.h> > > #define GPIODIR 0x400 > #define GPIOIS 0x404 > @@ -211,8 +212,9 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) > struct list_head *chip_list = irq_get_handler_data(irq); > struct list_head *ptr; > struct pl061_gpio *chip; > + struct irq_chip *irqchip = irq_desc_get_chip(desc); > > - desc->irq_data.chip->irq_ack(&desc->irq_data); > + chained_irq_enter(irqchip, desc); > list_for_each(ptr, chip_list) { > unsigned long pending; > int offset; > @@ -227,7 +229,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) > for_each_set_bit(offset, &pending, PL061_GPIO_NR) > generic_handle_irq(pl061_to_irq(&chip->gc, offset)); > } > - desc->irq_data.chip->irq_unmask(&desc->irq_data); > + chained_irq_exit(irqchip, desc); > } > > static int pl061_probe(struct amba_device *dev, const struct amba_id *id) > -- > 1.7.5.4 >
-- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |