[10/12] gpio: ts4900: Use of_device_get_match_data()

Message ID	20180430073819.31827-10-thierry.reding@gmail.com
State	New
Headers	show Return-Path: <linux-gpio-owner@vger.kernel.org> 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 10/12] gpio: ts4900: Use of_device_get_match_data() Date: Mon, 30 Apr 2018 09:38:17 +0200 Message-Id: <20180430073819.31827-10-thierry.reding@gmail.com> In-Reply-To: <20180430073819.31827-1-thierry.reding@gmail.com> References: <20180430073819.31827-1-thierry.reding@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk
Series	[01/12] gpio: 74xx-mmio: Use of_device_get_match_data() \| expand [01/12] gpio: 74xx-mmio: Use of_device_get_match_data() [02/12] gpio: dwapb: Use of_device_get_match_data() [03/12] gpio: ge: Use of_device_get_match_data() [04/12] gpio: ingenic: Use of_device_get_match_data() [05/12] gpio: mxs: Use of_device_get_match_data() [06/12] gpio: palmas: Use of_device_get_match_data() [07/12] gpio: pca953x: Use of_device_get_match_data() [08/12] gpio: pxa: Use of_device_get_match_data() [09/12] gpio: syscon: Use of_device_get_match_data() [10/12] gpio: ts4900: Use of_device_get_match_data() [11/12] gpio: vf610: Use of_device_get_match_data() [12/12] gpio: xlp: Use of_device_get_match_data()

Message ID

20180430073819.31827-10-thierry.reding@gmail.com

State

New

Headers

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 10/12] gpio: ts4900: Use of_device_get_match_data()
Date: Mon, 30 Apr 2018 09:38:17 +0200
Message-Id: <20180430073819.31827-10-thierry.reding@gmail.com>
In-Reply-To: <20180430073819.31827-1-thierry.reding@gmail.com>
References: <20180430073819.31827-1-thierry.reding@gmail.com>
Sender: linux-gpio-owner@vger.kernel.org
Precedence: bulk

Series

[01/12] gpio: 74xx-mmio: Use of_device_get_match_data() | expand

Commit Message

Thierry Reding April 30, 2018, 7:38 a.m. UTC

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-ts4900.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-ts4900.c b/drivers/gpio/gpio-ts4900.c
index 5bd21725e604..1da8d0586329 100644
--- a/drivers/gpio/gpio-ts4900.c
+++ b/drivers/gpio/gpio-ts4900.c
@@ -128,15 +128,10 @@  MODULE_DEVICE_TABLE(of, ts4900_gpio_of_match_table);
 static int ts4900_gpio_probe(struct i2c_client *client,
 			const struct i2c_device_id *id)
 {
-	const struct of_device_id *match;
 	struct ts4900_gpio_priv *priv;
 	u32 ngpio;
 	int ret;
 
-	match = of_match_device(ts4900_gpio_of_match_table, &client->dev);
-	if (!match)
-		return -EINVAL;
-
 	if (of_property_read_u32(client->dev.of_node, "ngpios", &ngpio))
 		ngpio = DEFAULT_PIN_NUMBER;
 
@@ -148,7 +143,7 @@  static int ts4900_gpio_probe(struct i2c_client *client,
 	priv->gpio_chip.label = "ts4900-gpio";
 	priv->gpio_chip.ngpio = ngpio;
 	priv->gpio_chip.parent = &client->dev;
-	priv->input_bit = (uintptr_t)match->data;
+	priv->input_bit = (uintptr_t)of_device_get_match_data(&client->dev);
 
 	priv->regmap = devm_regmap_init_i2c(client, &ts4900_regmap_config);
 	if (IS_ERR(priv->regmap)) {

[10/12] gpio: ts4900: Use of_device_get_match_data()

Commit Message

Patch