| Message ID | 20200409141228.49561-8-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: dwapb: Clean up the driver and a fix | expand |
On Thu, Apr 09, 2020 at 05:12:22PM +0300, Andy Shevchenko wrote: > IRQ core provides macros such as IRQ_RETVAL(). > Convert code to use them. Looks good. Thanks. Reviewed-by: Serge Semin <fancer.lancer@gmail.com> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpio/gpio-dwapb.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c > index a0a0288bb73e..916a42fea456 100644 > --- a/drivers/gpio/gpio-dwapb.c > +++ b/drivers/gpio/gpio-dwapb.c > @@ -258,8 +258,7 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type) > unsigned long level, polarity, flags; > u32 bit = irqd_to_hwirq(d); > > - if (type & ~(IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING | > - IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) > + if (type & ~IRQ_TYPE_SENSE_MASK) > return -EINVAL; > > spin_lock_irqsave(&gc->bgpio_lock, flags); > @@ -351,12 +350,7 @@ static int dwapb_gpio_set_config(struct gpio_chip *gc, unsigned offset, > > static irqreturn_t dwapb_irq_handler_mfd(int irq, void *dev_id) > { > - u32 worked; > - struct dwapb_gpio *gpio = dev_id; > - > - worked = dwapb_do_irq(gpio); > - > - return worked ? IRQ_HANDLED : IRQ_NONE; > + return IRQ_RETVAL(dwapb_do_irq(dev_id)); > } > > static void dwapb_configure_irqs(struct dwapb_gpio *gpio, > -- > 2.25.1 >
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index a0a0288bb73e..916a42fea456 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c @@ -258,8 +258,7 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type) unsigned long level, polarity, flags; u32 bit = irqd_to_hwirq(d); - if (type & ~(IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING | - IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) + if (type & ~IRQ_TYPE_SENSE_MASK) return -EINVAL; spin_lock_irqsave(&gc->bgpio_lock, flags); @@ -351,12 +350,7 @@ static int dwapb_gpio_set_config(struct gpio_chip *gc, unsigned offset, static irqreturn_t dwapb_irq_handler_mfd(int irq, void *dev_id) { - u32 worked; - struct dwapb_gpio *gpio = dev_id; - - worked = dwapb_do_irq(gpio); - - return worked ? IRQ_HANDLED : IRQ_NONE; + return IRQ_RETVAL(dwapb_do_irq(dev_id)); } static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
IRQ core provides macros such as IRQ_RETVAL(). Convert code to use them. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpio-dwapb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)