w1: gpio: Make use of device properties

Convert the module to be property provider agnostic and allow
it to be used on non-OF platforms.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240307143644.3787260-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 34128e6bbbfaf607726be95d4f5a442fdc7117a7..8ea53c757c990a02f5c983f6d2933377e37fd11e 100644 (file)
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -6,13 +6,13 @@
  */
 
 #include <linux/init.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 #include <linux/gpio/consumer.h>
-#include <linux/of_platform.h>
 #include <linux/err.h>
-#include <linux/of.h>
 #include <linux/delay.h>
 
 #include <linux/w1.h>
@@ -63,20 +63,11 @@ static u8 w1_gpio_read_bit(void *data)
        return gpiod_get_value(ddata->gpiod) ? 1 : 0;
 }
 
-#if defined(CONFIG_OF)
-static const struct of_device_id w1_gpio_dt_ids[] = {
-       { .compatible = "w1-gpio" },
-       {}
-};
-MODULE_DEVICE_TABLE(of, w1_gpio_dt_ids);
-#endif
-
 static int w1_gpio_probe(struct platform_device *pdev)
 {
        struct w1_bus_master *master;
        struct w1_gpio_ddata *ddata;
        struct device *dev = &pdev->dev;
-       struct device_node *np = dev->of_node;
        /* Enforce open drain mode by default */
        enum gpiod_flags gflags = GPIOD_OUT_LOW_OPEN_DRAIN;
        int err;
@@ -91,7 +82,7 @@ static int w1_gpio_probe(struct platform_device *pdev)
         * driver it high/low like we are in full control of the line and
         * open drain will happen transparently.
         */
-       if (of_property_present(np, "linux,open-drain"))
+       if (device_property_present(dev, "linux,open-drain"))
                gflags = GPIOD_OUT_LOW;
 
        master = devm_kzalloc(dev, sizeof(struct w1_bus_master),
@@ -152,10 +143,16 @@ static void w1_gpio_remove(struct platform_device *pdev)
        w1_remove_master_device(master);
 }
 
+static const struct of_device_id w1_gpio_dt_ids[] = {
+       { .compatible = "w1-gpio" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, w1_gpio_dt_ids);
+
 static struct platform_driver w1_gpio_driver = {
        .driver = {
                .name   = "w1-gpio",
-               .of_match_table = of_match_ptr(w1_gpio_dt_ids),
+               .of_match_table = w1_gpio_dt_ids,
        },
        .probe = w1_gpio_probe,
        .remove_new = w1_gpio_remove,