]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gpio: ts4900: use generic device properties
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Mon, 7 Oct 2024 10:40:52 +0000 (12:40 +0200)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Mon, 14 Oct 2024 08:28:21 +0000 (10:28 +0200)
There's no reason to use OF-specific variants of property getters.
Switch to using the preferred, generic device property helpers.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20241007104052.39374-1-brgl@bgdev.pl
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-ts4900.c

index 0f6397b77c9d97d6c0560a636796022a50732194..5c806140fdf0d6e60f2225824aa18d393f61b607 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <linux/gpio/driver.h>
 #include <linux/i2c.h>
-#include <linux/of.h>
 #include <linux/module.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 
 #define DEFAULT_PIN_NUMBER     32
@@ -142,7 +142,7 @@ static int ts4900_gpio_probe(struct i2c_client *client)
        u32 ngpio;
        int ret;
 
-       if (of_property_read_u32(client->dev.of_node, "ngpios", &ngpio))
+       if (device_property_read_u32(&client->dev, "ngpios", &ngpio))
                ngpio = DEFAULT_PIN_NUMBER;
 
        priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
@@ -153,7 +153,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)of_device_get_match_data(&client->dev);
+       priv->input_bit = (uintptr_t)device_get_match_data(&client->dev);
 
        priv->regmap = devm_regmap_init_i2c(client, &ts4900_regmap_config);
        if (IS_ERR(priv->regmap)) {