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 v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI
Date: Tue, 28 May 2019 15:28:57 +0100 [thread overview]
Message-ID: <20190528142900.24147-3-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20190528142900.24147-1-ckeepax@opensource.cirrus.com>
In preparation for future refactoring factor out the fetch of the IRQ
into its own helper function.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
Changes since v2:
- Don't consider zero to be a valid IRQ number
Thanks,
Charles
drivers/i2c/i2c-core-acpi.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index bc82b44f85860..c107f260e252f 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -148,14 +148,30 @@ 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)
+{
+ struct list_head resource_list;
+ int irq = -ENOENT;
+ int ret;
+
+ INIT_LIST_HEAD(&resource_list);
+
+ ret = acpi_dev_get_resources(adev, &resource_list,
+ i2c_acpi_add_resource, &irq);
+ if (ret < 0)
+ return -EINVAL;
+
+ acpi_dev_free_resource_list(&resource_list);
+
+ return irq;
+}
+
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 i2c_acpi_lookup lookup;
- int irq = -ENOENT;
int ret;
memset(&lookup, 0, sizeof(lookup));
@@ -186,16 +202,9 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
*adapter_handle = lookup.adapter_handle;
/* Then fill IRQ number if any */
- INIT_LIST_HEAD(&resource_list);
- ret = acpi_dev_get_resources(adev, &resource_list,
- i2c_acpi_add_resource, &irq);
- if (ret < 0)
- return -EINVAL;
-
- if (irq > 0)
- info->irq = irq;
-
- acpi_dev_free_resource_list(&resource_list);
+ ret = i2c_acpi_get_irq(adev);
+ if (ret > 0)
+ info->irq = ret;
acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
sizeof(info->type));
--
2.11.0
next prev parent reply other threads:[~2019-05-28 14:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
2019-05-29 7:35 ` Mika Westerberg
2019-06-04 17:00 ` Andy Shevchenko
2019-06-05 8:26 ` Charles Keepax
2019-05-28 14:28 ` Charles Keepax [this message]
2019-05-29 7:36 ` [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI Mika Westerberg
2019-05-28 14:28 ` [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
2019-05-29 7:43 ` Mika Westerberg
2019-06-04 17:04 ` Andy Shevchenko
2019-06-05 8:22 ` Charles Keepax
2019-05-28 14:28 ` [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
2019-05-29 7:43 ` Mika Westerberg
2019-05-28 14:29 ` [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq Charles Keepax
2019-05-29 7:44 ` Mika Westerberg
2019-05-29 7:34 ` [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Mika Westerberg
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=20190528142900.24147-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).