| Message ID | 20190620133420.4632-3-ckeepax@opensource.cirrus.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | I2C IRQ Probe Improvements | expand |
On Thu, Jun 20, 2019 at 02:34:15PM +0100, Charles Keepax wrote: > Use the available IRQ helper functions, most of the functions have > additional helpful side affects like configuring the trigger type of the > IRQ. > > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Some last minute observations / questions. > + struct resource r; > + > + if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r)) > + *irq = i2c_dev_irq_from_resources(&r, 1); > + > + return 1; /* No need to add resource to the list */ If we don't add it to the list, do we still need to manage the empty resource_list below? > /* Then fill IRQ number if any */ > INIT_LIST_HEAD(&resource_list); > - ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL); > + ret = acpi_dev_get_resources(adev, &resource_list, > + i2c_acpi_add_resource, &irq); > if (ret < 0) > return -EINVAL; > > - resource_list_for_each_entry(entry, &resource_list) { > - if (resource_type(entry->res) == IORESOURCE_IRQ) { > - info->irq = entry->res->start; > - break; > - } > - } > + if (irq > 0) > + info->irq = irq; Hmm... can't we just assign it directly inside the _add_resource() call back as original code did?
On Thu, Jun 20, 2019 at 05:52:21PM +0300, Andy Shevchenko wrote: > On Thu, Jun 20, 2019 at 02:34:15PM +0100, Charles Keepax wrote: > > Use the available IRQ helper functions, most of the functions have > > additional helpful side affects like configuring the trigger type of the > > IRQ. > > > > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> > > Some last minute observations / questions. > > > + struct resource r; > > + > > + if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r)) > > + *irq = i2c_dev_irq_from_resources(&r, 1); > > + > > + return 1; /* No need to add resource to the list */ > > If we don't add it to the list, do we still need to manage the empty > resource_list below? > I think you are right looking closely I think we can skip this. I might update the comment here to make it clear the list needs freed if this is changed though. > > /* Then fill IRQ number if any */ > > INIT_LIST_HEAD(&resource_list); > > - ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL); > > + ret = acpi_dev_get_resources(adev, &resource_list, > > + i2c_acpi_add_resource, &irq); > > if (ret < 0) > > return -EINVAL; > > > > - resource_list_for_each_entry(entry, &resource_list) { > > - if (resource_type(entry->res) == IORESOURCE_IRQ) { > > - info->irq = entry->res->start; > > - break; > > - } > > - } > > > + if (irq > 0) > > + info->irq = irq; > > Hmm... can't we just assign it directly inside the _add_resource() call back as > original code did? > Again I think you are correct here, my thinking had been to preserve the original functionality of only overwriting the value in info->irq if we found one. But it looks like all callers don't pass anything meaningful in this field so changing that behaviour shouldn't matter. Thanks, Charles
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index f1d648962b223..47d5b1c5ec9e0 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -133,14 +133,25 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev, return 0; } +static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data) +{ + int *irq = data; + struct resource r; + + if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r)) + *irq = i2c_dev_irq_from_resources(&r, 1); + + return 1; /* No need to add resource to the list */ +} + static int i2c_acpi_get_info(struct acpi_device *adev, struct i2c_board_info *info, struct i2c_adapter *adapter, acpi_handle *adapter_handle) { struct list_head resource_list; - struct resource_entry *entry; struct i2c_acpi_lookup lookup; + int irq = -ENOENT; int ret; memset(&lookup, 0, sizeof(lookup)); @@ -172,16 +183,13 @@ static int i2c_acpi_get_info(struct acpi_device *adev, /* Then fill IRQ number if any */ INIT_LIST_HEAD(&resource_list); - ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL); + ret = acpi_dev_get_resources(adev, &resource_list, + i2c_acpi_add_resource, &irq); if (ret < 0) return -EINVAL; - resource_list_for_each_entry(entry, &resource_list) { - if (resource_type(entry->res) == IORESOURCE_IRQ) { - info->irq = entry->res->start; - break; - } - } + if (irq > 0) + info->irq = irq; acpi_dev_free_resource_list(&resource_list);