LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
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 1/5] i2c: acpi: Factor out getting the IRQ from ACPI
Date: Tue, 21 May 2019 16:04:58 +0100	[thread overview]
Message-ID: <20190521150502.27305-2-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20190521150502.27305-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>
---
 drivers/i2c/i2c-core-acpi.c | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 2728006920888..c3ac3ea184317 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -137,13 +137,35 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev,
 	return 0;
 }
 
+static int i2c_acpi_get_irq(struct acpi_device *adev, int *irq)
+{
+	struct list_head resource_list;
+	struct resource_entry *entry;
+	int ret;
+
+	INIT_LIST_HEAD(&resource_list);
+
+	ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
+	if (ret < 0)
+		return -EINVAL;
+
+	resource_list_for_each_entry(entry, &resource_list) {
+		if (resource_type(entry->res) == IORESOURCE_IRQ) {
+			*irq = entry->res->start;
+			break;
+		}
+	}
+
+	acpi_dev_free_resource_list(&resource_list);
+
+	return 0;
+}
+
 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;
 
@@ -175,19 +197,7 @@ 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, NULL, NULL);
-	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);
+	i2c_acpi_get_irq(adev, &info->irq);
 
 	acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
 			  sizeof(info->type));
-- 
2.11.0


  reply	other threads:[~2019-05-21 15:05 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-21 15:04 [PATCH 0/5] I2C IRQ Probe Improvements Charles Keepax
2019-05-21 15:04 ` Charles Keepax [this message]
2019-05-21 15:04 ` [PATCH 2/5] i2c: acpi: Use available IRQ helper functions Charles Keepax
2019-05-21 17:16   ` Andy Shevchenko
2019-05-21 15:05 ` [PATCH 3/5] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
2019-05-21 17:18   ` Andy Shevchenko
2019-05-21 15:05 ` [PATCH 4/5] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
2019-05-21 17:27   ` Andy Shevchenko
2019-05-22  8:19     ` Charles Keepax
2019-05-21 15:05 ` [PATCH 5/5] i2c: core: Tidy up handling of init_irq Charles Keepax
  -- strict thread matches above, loose matches on Subject: below --
2019-05-20  8:49 [PATCH 0/5] I2C IRQ Probe Improvements Charles Keepax
2019-05-20  8:49 ` [PATCH 1/5] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
2019-05-21 11:17   ` 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=20190521150502.27305-2-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 \
    --subject='Re: [PATCH 1/5] i2c: acpi: Factor out getting the IRQ from ACPI' \
    /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

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).