[PATCH v6 4/7] i2c: core: Make i2c_acpi_get_irq available to the rest of the I2C core

From: Charles Keepax
Date: Fri Jun 21 2019 - 06:08:54 EST


In preparation for more refactoring make i2c_acpi_get_irq available
outside i2c-core-acpi.c.

Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
---

Changes since v5:
- Pass a struct device rather than acpi_device to i2c_acpi_get_irq,
note this is more awkward than I would have liked as I am very
unconvinced that adev->dev can actually be passed to
ACPI_COMPANION. If anyone can answer that for sure that would be
very helpful.

Thanks,
Charles

drivers/i2c/i2c-core-acpi.c | 13 +++++++++++--
drivers/i2c/i2c-core.h | 7 +++++++
2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index c91492eaacd93..37bf80b35365f 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -145,8 +145,17 @@ static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
return 1;
}

-static int i2c_acpi_get_irq(struct acpi_device *adev)
+/**
+ * i2c_acpi_get_irq - get device IRQ number from ACPI
+ * @client: Pointer to the I2C client device
+ *
+ * Find the IRQ number used by a specific client device.
+ *
+ * Return: The IRQ number or an error code.
+ */
+int i2c_acpi_get_irq(struct device *dev)
{
+ struct acpi_device *adev = container_of(dev, struct acpi_device, dev);
struct list_head resource_list;
int irq = -ENOENT;
int ret;
@@ -199,7 +208,7 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
*adapter_handle = lookup.adapter_handle;

/* Then fill IRQ number if any */
- info->irq = i2c_acpi_get_irq(adev);
+ info->irq = i2c_acpi_get_irq(&adev->dev);
if (info->irq < 0)
return info->irq;

diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
index 2a3b28bf826b1..1735ac17a957a 100644
--- a/drivers/i2c/i2c-core.h
+++ b/drivers/i2c/i2c-core.h
@@ -63,6 +63,8 @@ const struct acpi_device_id *
i2c_acpi_match_device(const struct acpi_device_id *matches,
struct i2c_client *client);
void i2c_acpi_register_devices(struct i2c_adapter *adap);
+
+int i2c_acpi_get_irq(struct device *dev);
#else /* CONFIG_ACPI */
static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { }
static inline const struct acpi_device_id *
@@ -71,6 +73,11 @@ i2c_acpi_match_device(const struct acpi_device_id *matches,
{
return NULL;
}
+
+static inline int i2c_acpi_get_irq(struct device *dev)
+{
+ return 0;
+}
#endif /* CONFIG_ACPI */
extern struct notifier_block i2c_acpi_notifier;

--
2.11.0