From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <wsa@the-dreams.de>, <mika.westerberg@linux.intel.com>
Cc: <jarkko.nikula@linux.intel.com>,
<andriy.shevchenko@linux.intel.com>, <linux-i2c@vger.kernel.org>,
<linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<benjamin.tissoires@redhat.com>, <jbroadus@gmail.com>,
<patches@opensource.cirrus.com>
Subject: [PATCH v4 4/7] i2c: core: Make i2c_acpi_get_irq available to the rest of the I2C core
Date: Tue, 11 Jun 2019 13:30:58 +0100 [thread overview]
Message-ID: <20190611123101.25264-5-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20190611123101.25264-1-ckeepax@opensource.cirrus.com>
In preparation for more refactoring make i2c_acpi_get_irq available
outside i2c-core-acpi.c.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
Changes since v3:
- Move the change to use the helper function from i2c-core-base into its own patch.
Thanks,
Charles
drivers/i2c/i2c-core-acpi.c | 15 +++++++++++++--
drivers/i2c/i2c-core.h | 7 +++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 7d4d66ba752d4..35966cc337dde 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -144,8 +144,17 @@ static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
return 1; /* No need to add resource to the list */
}
-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 i2c_client *client)
{
+ struct acpi_device *adev = ACPI_COMPANION(&client->adapter->dev);
struct list_head resource_list;
int irq = -ENOENT;
int ret;
@@ -162,6 +171,8 @@ static int i2c_acpi_get_irq(struct acpi_device *adev)
return irq;
}
+static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev);
+
static int i2c_acpi_get_info(struct acpi_device *adev,
struct i2c_board_info *info,
struct i2c_adapter *adapter,
@@ -198,7 +209,7 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
*adapter_handle = lookup.adapter_handle;
/* Then fill IRQ number if any */
- ret = i2c_acpi_get_irq(adev);
+ ret = i2c_acpi_get_irq(i2c_acpi_find_client_by_adev(adev));
if (ret > 0)
info->irq = ret;
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
index 2a3b28bf826b1..517d98be68d25 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 i2c_client *client);
#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 i2c_client *client)
+{
+ return 0;
+}
#endif /* CONFIG_ACPI */
extern struct notifier_block i2c_acpi_notifier;
--
2.11.0
next prev parent reply other threads:[~2019-06-11 12:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 12:30 [PATCH v4 0/7] I2C IRQ Probe Improvements Charles Keepax
2019-06-11 12:30 ` [PATCH v4 1/7] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
2019-06-11 12:30 ` [PATCH v4 2/7] i2c: acpi: Use available IRQ helper functions Charles Keepax
2019-06-11 12:47 ` Andy Shevchenko
2019-06-11 12:30 ` [PATCH v4 3/7] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
2019-06-11 12:30 ` Charles Keepax [this message]
2019-06-12 7:20 ` [PATCH v4 4/7] i2c: core: Make i2c_acpi_get_irq available to the rest of the I2C core Mika Westerberg
2019-06-12 15:11 ` Benjamin Tissoires
2019-06-12 15:27 ` Mika Westerberg
2019-06-13 8:48 ` Charles Keepax
2019-06-13 9:32 ` Benjamin Tissoires
2019-06-13 15:06 ` Charles Keepax
2019-06-11 12:30 ` [PATCH v4 5/7] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
2019-06-11 12:31 ` [PATCH v4 6/7] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
2019-06-11 12:31 ` [PATCH v4 7/7] i2c: core: Tidy up handling of init_irq Charles Keepax
2019-06-11 12:51 ` [PATCH v4 0/7] I2C IRQ Probe Improvements Andy Shevchenko
2019-06-11 15:16 ` Benjamin Tissoires
2019-06-11 15:28 ` Charles Keepax
2019-06-12 15:13 ` Benjamin Tissoires
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190611123101.25264-5-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=jbroadus@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=patches@opensource.cirrus.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).