| Message ID | 20200518174138.19367-4-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/4] gpio: dwapb: Call acpi_gpiochip_free_interrupts() on GPIO chip de-registration | expand |
On Mon, May 18, 2020 at 08:41:38PM +0300, Andy Shevchenko wrote: > has_irq member of struct dwapb_port_property is used only in one place, > so, make it local test instead and remove from the structure. > This local test is using memchr_inv() which is quite effective in comparison > to the original loop and possible little overhead can be neglected. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Serge Semin <fancer.lancer@gmail.com> > Cc: Lee Jones <lee.jones@linaro.org> > --- > v2: > - fixed compilation error (kbuild bot) > - added Lee into Cc Lee, JFYI, you have not been forgotten in the v1, this is due to missed change in the MFD driver in v1 and since kbuild bot reported it this is the first version which includes MFD changes. > - moved memchr_inv() here (Serge)
On Mon, 18 May 2020, Andy Shevchenko wrote: > has_irq member of struct dwapb_port_property is used only in one place, > so, make it local test instead and remove from the structure. > This local test is using memchr_inv() which is quite effective in comparison > to the original loop and possible little overhead can be neglected. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Serge Semin <fancer.lancer@gmail.com> > Cc: Lee Jones <lee.jones@linaro.org> > --- > v2: > - fixed compilation error (kbuild bot) > - added Lee into Cc > - moved memchr_inv() here (Serge) > drivers/gpio/gpio-dwapb.c | 14 +++++++------- > drivers/mfd/intel_quark_i2c_gpio.c | 1 - Acked-by: Lee Jones <lee.jones@linaro.org> > include/linux/platform_data/gpio-dwapb.h | 1 - > 3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index c939afac44c9..1d8d55bd63aa 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c @@ -366,6 +366,11 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio, irq_hw_number_t hwirq; int err, i; + if (memchr_inv(pp->irq, 0, sizeof(pp->irq)) == NULL) { + dev_warn(gpio->dev, "no IRQ for port%d\n", pp->idx); + return; + } + gpio->domain = irq_domain_create_linear(fwnode, ngpio, &irq_generic_chip_ops, gpio); if (!gpio->domain) @@ -501,7 +506,8 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio, if (pp->idx == 0) port->gc.set_config = dwapb_gpio_set_config; - if (pp->has_irq) + /* Only port A can provide interrupts in all configurations of the IP */ + if (pp->idx == 0) dwapb_configure_irqs(gpio, port, pp); err = gpiochip_add_data(&port->gc, port); @@ -550,13 +556,7 @@ static void dwapb_get_irq(struct device *dev, struct fwnode_handle *fwnode, irq = platform_get_irq_optional(to_platform_device(dev), j); if (irq > 0) pp->irq[j] = irq; - - if (pp->irq[j] >= 0) - pp->has_irq = true; } - - if (!pp->has_irq) - dev_warn(dev, "no irq for port%d\n", pp->idx); } static struct dwapb_platform_data *dwapb_gpio_get_pdata(struct device *dev) diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c index 41326b48da55..84ca7902e1df 100644 --- a/drivers/mfd/intel_quark_i2c_gpio.c +++ b/drivers/mfd/intel_quark_i2c_gpio.c @@ -216,7 +216,6 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell) pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO; pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE; pdata->properties->irq[0] = pdev->irq; - pdata->properties->has_irq = true; pdata->properties->irq_shared = true; cell->platform_data = pdata; diff --git a/include/linux/platform_data/gpio-dwapb.h b/include/linux/platform_data/gpio-dwapb.h index 3c606c450d05..ff1be737bad6 100644 --- a/include/linux/platform_data/gpio-dwapb.h +++ b/include/linux/platform_data/gpio-dwapb.h @@ -12,7 +12,6 @@ struct dwapb_port_property { unsigned int ngpio; unsigned int gpio_base; int irq[32]; - bool has_irq; bool irq_shared; };
has_irq member of struct dwapb_port_property is used only in one place, so, make it local test instead and remove from the structure. This local test is using memchr_inv() which is quite effective in comparison to the original loop and possible little overhead can be neglected. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Lee Jones <lee.jones@linaro.org> --- v2: - fixed compilation error (kbuild bot) - added Lee into Cc - moved memchr_inv() here (Serge) drivers/gpio/gpio-dwapb.c | 14 +++++++------- drivers/mfd/intel_quark_i2c_gpio.c | 1 - include/linux/platform_data/gpio-dwapb.h | 1 - 3 files changed, 7 insertions(+), 9 deletions(-)