| Message ID | 20190626150302.22703-3-ckeepax@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | I2C IRQ Probe Improvements | expand |
On Wed, Jun 26, 2019 at 04:02:58PM +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. > - acpi_dev_free_resource_list(&resource_list); I have thought that we can drop completely the resource_list, though ACPI doesn't allow this. So, I would rather withdraw this change to be on the safe (symmetrical) side.
On Wed, Jun 26, 2019 at 10:09:06PM +0300, Andy Shevchenko wrote: > On Wed, Jun 26, 2019 at 04:02:58PM +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. > > > - acpi_dev_free_resource_list(&resource_list); > > I have thought that we can drop completely the resource_list, though ACPI > doesn't allow this. So, I would rather withdraw this change to be on the safe > (symmetrical) side. > Yeah would be my preference as well, will do another spin. Thanks, Charles
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index f1d648962b223..3951e352317ff 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -133,13 +133,24 @@ 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); + + /* No need to add resource to the list, free list if this changes */ + return 1; +} + 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 ret; @@ -172,19 +183,11 @@ 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, &info->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; - } - } - - acpi_dev_free_resource_list(&resource_list); - acpi_set_modalias(adev, dev_name(&adev->dev), info->type, sizeof(info->type));
Use the available IRQ helper functions, most of the functions have additional helpful side affects like configuring the trigger type of the IRQ. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> --- No change since v6. Thanks, Charles drivers/i2c/i2c-core-acpi.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)