[v4,03/24] i2c: acpi: Modify i2c_acpi_get_irq() to use resource
Commit Message
The i2c_acpi_irq_context structure provides redundant information that
can be provided with struct resource.
Refactor i2c_acpi_get_irq() to use struct resource instead of struct
i2c_acpi_irq_context.
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
---
Changes in v4:
-Use Andy's @linux.intel.com email
-Remove blank line in commit message
-More error handling refactoring in i2c_acpi_get_irq()
-Remove struct i2c_acpi_irq_context as it's unused
Changes in v3:
-Add Suggested-by
-Check resource flags for valid irq
-Drop error pointer check
-Invert error checking logic in i2c_acpi_get_irq()
-Drop redundant 0 in struct resource init
-Drop unnecessary check for irq > 0 when setting I2C_CLIENT_WAKE
Changes in v2:
-New patch
drivers/i2c/i2c-core-acpi.c | 49 +++++++++++++------------------------
drivers/i2c/i2c-core-base.c | 6 ++---
drivers/i2c/i2c-core.h | 4 +--
3 files changed, 22 insertions(+), 37 deletions(-)
Comments
On Tue, Jan 02, 2024 at 02:07:27PM -0700, Mark Hasemeyer wrote:
> The i2c_acpi_irq_context structure provides redundant information that
> can be provided with struct resource.
>
> Refactor i2c_acpi_get_irq() to use struct resource instead of struct
> i2c_acpi_irq_context.
...
> ret = acpi_dev_get_resources(adev, &resource_list,
> - i2c_acpi_add_irq_resource, &irq_ctx);
> + i2c_acpi_add_irq_resource, r);
Up to you, but you can make it a single line.
ret = acpi_dev_get_resources(adev, &resource_list, i2c_acpi_add_irq_resource, r);
> if (ret < 0)
> return ret;
...
> +++ b/drivers/i2c/i2c-core-base.c
> + struct resource r = {};
Needs ioport.h.
...
> + irq = i2c_acpi_get_irq(client, &r);
> + if (r.flags & IORESOURCE_IRQ_WAKECAPABLE)
Ditto.
> client->flags |= I2C_CLIENT_WAKE;
> }
...
> +++ b/drivers/i2c/i2c-core.h
> +int i2c_acpi_get_irq(struct i2c_client *client, struct resource *r);
> +static inline int i2c_acpi_get_irq(struct i2c_client *client, struct resource *r)
Needs a forward declaration (besides the inclusion block is a total mess
in this file).
@@ -137,11 +137,6 @@ static const struct acpi_device_id i2c_acpi_ignored_device_ids[] = {
{}
};
-struct i2c_acpi_irq_context {
- int irq;
- bool wake_capable;
-};
-
static int i2c_acpi_do_lookup(struct acpi_device *adev,
struct i2c_acpi_lookup *lookup)
{
@@ -175,64 +170,54 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev,
static int i2c_acpi_add_irq_resource(struct acpi_resource *ares, void *data)
{
- struct i2c_acpi_irq_context *irq_ctx = data;
- struct resource r;
+ struct resource *r = data;
- if (irq_ctx->irq > 0)
+ if (r->flags)
return 1;
- if (!acpi_dev_resource_interrupt(ares, 0, &r))
+ if (!acpi_dev_resource_interrupt(ares, 0, r))
return 1;
- irq_ctx->irq = i2c_dev_irq_from_resources(&r, 1);
- irq_ctx->wake_capable = r.flags & IORESOURCE_IRQ_WAKECAPABLE;
+ i2c_dev_irq_from_resources(r, 1);
return 1; /* No need to add resource to the list */
}
/**
- * i2c_acpi_get_irq - get device IRQ number from ACPI
+ * i2c_acpi_get_irq - get device IRQ number from ACPI and populate resource
* @client: Pointer to the I2C client device
- * @wake_capable: Set to true if the IRQ is wake capable
+ * @r: resource with populated IRQ information
*
* Find the IRQ number used by a specific client device.
*
* Return: The IRQ number or an error code.
*/
-int i2c_acpi_get_irq(struct i2c_client *client, bool *wake_capable)
+int i2c_acpi_get_irq(struct i2c_client *client, struct resource *r)
{
struct acpi_device *adev = ACPI_COMPANION(&client->dev);
struct list_head resource_list;
- struct resource irqres;
- struct i2c_acpi_irq_context irq_ctx = {
- .irq = -ENOENT,
- };
int ret;
+ if (!r)
+ return -EINVAL;
+
INIT_LIST_HEAD(&resource_list);
ret = acpi_dev_get_resources(adev, &resource_list,
- i2c_acpi_add_irq_resource, &irq_ctx);
+ i2c_acpi_add_irq_resource, r);
if (ret < 0)
return ret;
acpi_dev_free_resource_list(&resource_list);
- if (irq_ctx.irq == -ENOENT) {
- ret = acpi_dev_get_gpio_irq_resource(adev, NULL, 0, &irqres);
- if (ret)
- return ret;
- irq_ctx.irq = irqres.start;
- irq_ctx.wake_capable = irqres.flags & IORESOURCE_IRQ_WAKECAPABLE;
- }
+ if (r->flags)
+ return r->start;
- if (irq_ctx.irq < 0)
- return irq_ctx.irq;
+ ret = acpi_dev_get_gpio_irq_resource(adev, NULL, 0, r);
+ if (ret)
+ return ret;
- if (wake_capable)
- *wake_capable = irq_ctx.wake_capable;
-
- return irq_ctx.irq;
+ return r->start;
}
static int i2c_acpi_get_info(struct acpi_device *adev,
@@ -513,10 +513,10 @@ static int i2c_device_probe(struct device *dev)
if (irq == -EINVAL || irq == -ENODATA)
irq = of_irq_get(dev->of_node, 0);
} else if (ACPI_COMPANION(dev)) {
- bool wake_capable;
+ struct resource r = {};
- irq = i2c_acpi_get_irq(client, &wake_capable);
- if (irq > 0 && wake_capable)
+ irq = i2c_acpi_get_irq(client, &r);
+ if (r.flags & IORESOURCE_IRQ_WAKECAPABLE)
client->flags |= I2C_CLIENT_WAKE;
}
if (irq == -EPROBE_DEFER) {
@@ -61,11 +61,11 @@ static inline int __i2c_check_suspended(struct i2c_adapter *adap)
#ifdef CONFIG_ACPI
void i2c_acpi_register_devices(struct i2c_adapter *adap);
-int i2c_acpi_get_irq(struct i2c_client *client, bool *wake_capable);
+int i2c_acpi_get_irq(struct i2c_client *client, struct resource *r);
#else /* CONFIG_ACPI */
static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { }
-static inline int i2c_acpi_get_irq(struct i2c_client *client, bool *wake_capable)
+static inline int i2c_acpi_get_irq(struct i2c_client *client, struct resource *r)
{
return 0;
}