gpio: ts4900: Use of_device_get_match_data()

Use of_device_get_match_data() instead of open-coding it.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-ts4900.c b/drivers/gpio/gpio-ts4900.c
index 5bd21725e6043db85583b6dbf5344dcdd12810c8..1da8d05863295b06f15e1d3b99255b867575ec1a 100644 (file)
--- 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)
 {
 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;
 
        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;
 
        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->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)) {
 
        priv->regmap = devm_regmap_init_i2c(client, &ts4900_regmap_config);
        if (IS_ERR(priv->regmap)) {