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 2/7] i2c: acpi: Use available IRQ helper functions
Date: Tue, 11 Jun 2019 13:30:56 +0100 [thread overview]
Message-ID: <20190611123101.25264-3-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20190611123101.25264-1-ckeepax@opensource.cirrus.com>
Use the available IRQ helper functions, most of the functions have
additional helpful side affects like configuring the trigger type of the
IRQ.
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
No changes since v3.
Apologies Andy but I really can't see a sensible way to split this
patch up. I have tried moving the resource_list_for_each_loop
into a function in one patch then switching to using
acpi_dev_resource_interrupt and i2c_dev_irq_from_resource, but the
function is basically a completely different function ie. all the
arguments are different and the purpose is different. So it makes
no sense, and it is very ping pong. I tried doing the switch to
i2c_dev_irq_from_resources as a separate patch which isn't so bad,
but feels pointless as it is such a small change, let me know if you
really want me to send that version.
Basically the switch to the helper function and the use of
acpi_dev_resource_interrupt are intrinsically linked, so there isn't
really a sensible way to split those up. If you still want some
changes I am afraid you will have to be more specific in what you are
looking for.
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 f1d648962b223..47d5b1c5ec9e0 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -133,14 +133,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));
@@ -172,16 +183,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
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 ` Charles Keepax [this message]
2019-06-11 12:47 ` [PATCH v4 2/7] i2c: acpi: Use available IRQ helper functions 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 ` [PATCH v4 4/7] i2c: core: Make i2c_acpi_get_irq available to the rest of the I2C core Charles Keepax
2019-06-12 7:20 ` 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-3-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).