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 <[email protected]>
---
Changes since v2:
- Don't consider zero to be a valid IRQ number
Thanks,
Charles
drivers/i2c/i2c-core-acpi.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 2728006920888..bc82b44f85860 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);
--
2.11.0
On Tue, May 28, 2019 at 03:28:56PM +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.
>
> Signed-off-by: Charles Keepax <[email protected]>
Reviewed-by: Mika Westerberg <[email protected]>
On Tue, May 28, 2019 at 03:28:56PM +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.
>
You do here two things, i.e.
- splitting out helper function
- converting it to use helpers
I would split the patch to do exact these steps separately, e.g.:
- splitting out to a local helper
- replacing open coded stuff with existing helpers
> Signed-off-by: Charles Keepax <[email protected]>
> ---
>
> Changes since v2:
> - Don't consider zero to be a valid IRQ number
>
> Thanks,
> Charles
>
> drivers/i2c/i2c-core-acpi.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
> index 2728006920888..bc82b44f85860 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);
>
> --
> 2.11.0
>
--
With Best Regards,
Andy Shevchenko
On Tue, Jun 04, 2019 at 08:00:52PM +0300, Andy Shevchenko wrote:
> On Tue, May 28, 2019 at 03:28:56PM +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.
> >
>
> You do here two things, i.e.
> - splitting out helper function
> - converting it to use helpers
>
> I would split the patch to do exact these steps separately, e.g.:
> - splitting out to a local helper
> - replacing open coded stuff with existing helpers
>
This can't really be done like this, the helper is called by
acpi_dev_get_resources and I need the acpi_resource from that to
call acpi_dev_resource_interrupt. I guess I could do a separate
patch to start using i2c_dev_irq_from_resource if that would be
preferrable? But I think the rest needs to stay together.
Thanks,
Charles