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 v6 6/7] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq
Date: Fri, 21 Jun 2019 11:08:14 +0100 [thread overview]
Message-ID: <20190621100815.12417-7-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20190621100815.12417-1-ckeepax@opensource.cirrus.com>
It makes sense to contain all the ACPI IRQ handling in a single helper
function.
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
drivers/i2c/i2c-core-acpi.c | 3 +++
drivers/i2c/i2c-core-base.c | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index aaca1e216be66..042c1cb148bc6 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -169,6 +169,9 @@ int i2c_acpi_get_irq(struct device *dev)
acpi_dev_free_resource_list(&resource_list);
+ if (irq == -ENOENT)
+ irq = acpi_dev_gpio_irq_get(adev, 0);
+
return irq;
}
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 34de732598533..87a2ad8f41a76 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -328,9 +328,6 @@ static int i2c_device_probe(struct device *dev)
irq = of_irq_get(dev->of_node, 0);
} else if (ACPI_COMPANION(dev)) {
irq = i2c_acpi_get_irq(dev);
-
- if (irq == -ENOENT)
- irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
}
if (irq == -EPROBE_DEFER)
return irq;
--
2.11.0
next prev parent reply other threads:[~2019-06-21 10:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 10:08 [PATCH v6 0/7] I2C IRQ Probe Improvements Charles Keepax
2019-06-21 10:08 ` [PATCH v6 1/7] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
2019-06-21 10:08 ` [PATCH v6 2/7] i2c: acpi: Use available IRQ helper functions Charles Keepax
2019-06-21 10:08 ` [PATCH v6 3/7] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
2019-06-21 10:08 ` [PATCH v6 4/7] i2c: core: Make i2c_acpi_get_irq available to the rest of the I2C core Charles Keepax
2019-06-21 12:24 ` Andy Shevchenko
2019-06-25 11:50 ` Mika Westerberg
2019-06-25 12:42 ` Charles Keepax
2019-06-25 13:25 ` Andy Shevchenko
2019-06-26 12:58 ` Charles Keepax
2019-06-21 10:08 ` [PATCH v6 5/7] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
2019-06-21 10:08 ` Charles Keepax [this message]
2019-06-21 10:08 ` [PATCH v6 7/7] i2c: core: Tidy up handling of init_irq Charles Keepax
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=20190621100815.12417-7-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).