LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 07/12] gpio: pca953x: Use of_device_get_match_data()
Date: Mon, 30 Apr 2018 09:38:14 +0200	[thread overview]
Message-ID: <20180430073819.31827-7-thierry.reding@gmail.com> (raw)
In-Reply-To: <20180430073819.31827-1-thierry.reding@gmail.com>

From: Thierry Reding <treding@nvidia.com>

Use of_device_get_match_data() instead of open-coding it.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpio/gpio-pca953x.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index d2ead4b1cf61..9a06b8a4f5be 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -810,13 +810,11 @@ static int pca953x_probe(struct i2c_client *client,
 		chip->driver_data = i2c_id->driver_data;
 	} else {
 		const struct acpi_device_id *acpi_id;
-		const struct of_device_id *match;
+		struct device *dev = &client->dev;
 
-		match = of_match_device(pca953x_dt_ids, &client->dev);
-		if (match) {
-			chip->driver_data = (int)(uintptr_t)match->data;
-		} else {
-			acpi_id = acpi_match_device(pca953x_acpi_ids, &client->dev);
+		chip->driver_data = (uintptr_t)of_device_get_match_data(dev);
+		if (!chip->driver_data) {
+			acpi_id = acpi_match_device(pca953x_acpi_ids, dev);
 			if (!acpi_id) {
 				ret = -ENODEV;
 				goto err_exit;
-- 
2.17.0

  parent reply	other threads:[~2018-04-30  7:39 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-30  7:38 [PATCH 01/12] gpio: 74xx-mmio: " Thierry Reding
2018-04-30  7:38 ` [PATCH 02/12] gpio: dwapb: " Thierry Reding
2018-04-30  7:38 ` [PATCH 03/12] gpio: ge: " Thierry Reding
2018-04-30  7:38 ` [PATCH 04/12] gpio: ingenic: " Thierry Reding
2018-04-30  7:38 ` [PATCH 05/12] gpio: mxs: " Thierry Reding
2018-04-30  7:38 ` [PATCH 06/12] gpio: palmas: " Thierry Reding
2018-04-30  7:38 ` Thierry Reding [this message]
2018-04-30  7:38 ` [PATCH 08/12] gpio: pxa: " Thierry Reding
2018-04-30  7:38 ` [PATCH 09/12] gpio: syscon: " Thierry Reding
2018-04-30  7:38 ` [PATCH 10/12] gpio: ts4900: " Thierry Reding
2018-04-30  7:38 ` [PATCH 11/12] gpio: vf610: " Thierry Reding
2018-04-30  7:38 ` [PATCH 12/12] gpio: xlp: " Thierry Reding
2018-05-02 12:44 ` [PATCH 01/12] gpio: 74xx-mmio: " Linus Walleij

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=20180430073819.31827-7-thierry.reding@gmail.com \
    --to=thierry.reding@gmail.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 07/12] gpio: pca953x: Use of_device_get_match_data()' \
    /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).