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 v7 2/6] i2c: acpi: Use available IRQ helper functions
Date: Wed, 26 Jun 2019 16:02:58 +0100 [thread overview]
Message-ID: <20190626150302.22703-3-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20190626150302.22703-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.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
No change since v6.
Thanks,
Charles
drivers/i2c/i2c-core-acpi.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index f1d648962b223..3951e352317ff 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -133,13 +133,24 @@ 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);
+
+ /* No need to add resource to the list, free list if this changes */
+ return 1;
+}
+
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 ret;
@@ -172,19 +183,11 @@ 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, &info->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;
- }
- }
-
- acpi_dev_free_resource_list(&resource_list);
-
acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
sizeof(info->type));
--
2.11.0
next prev parent reply other threads:[~2019-06-26 15:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 15:02 [PATCH v7 0/6] I2C IRQ Probe Improvements Charles Keepax
2019-06-26 15:02 ` [PATCH v7 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
2019-06-26 15:02 ` Charles Keepax [this message]
2019-06-26 19:09 ` [PATCH v7 2/6] i2c: acpi: Use available IRQ helper functions Andy Shevchenko
2019-06-27 8:18 ` Charles Keepax
2019-06-26 15:02 ` [PATCH v7 3/6] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
2019-06-26 15:03 ` [PATCH v7 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
2019-06-26 15:03 ` [PATCH v7 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
2019-06-26 15:03 ` [PATCH v7 6/6] i2c: core: Tidy up handling of init_irq Charles Keepax
2019-06-26 19:11 ` [PATCH v7 0/6] I2C IRQ Probe Improvements Andy Shevchenko
2019-06-29 11:29 ` Wolfram Sang
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=20190626150302.22703-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).