| Message ID | 20190527151932.14310-2-ckeepax@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v2,1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources | expand |
On Mon, May 27, 2019 at 04:19:28PM +0100, Charles Keepax wrote: > 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)); > @@ -176,16 +187,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) Since 0 is not valid IRQ, I think this should be written like: if (irg > 0) > + info->irq = irq; > > acpi_dev_free_resource_list(&resource_list); > > -- > 2.11.0
On Tue, May 28, 2019 at 01:30:28PM +0300, Mika Westerberg wrote: > On Mon, May 27, 2019 at 04:19:28PM +0100, Charles Keepax wrote: > > 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)); > > @@ -176,16 +187,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) > > Since 0 is not valid IRQ, I think this should be written like: > > if (irg > 0) > Yeah sorry thought IRQs were like GPIOs where 0 is a valid number, will update the patches. Thanks, Charles > > + info->irq = irq; > > > > acpi_dev_free_resource_list(&resource_list); > > > > -- > > 2.11.0
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index 2728006920888..4b0387d040698 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -137,14 +137,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)); @@ -176,16 +187,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);
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> --- Changes since v1: - Moved earlier in the patch series. drivers/i2c/i2c-core-acpi.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)