On Wed, 4 May 2022 14:35:57 +0300
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxxx>
Applied.
Thanks,
Jonathan
> ---
> drivers/iio/proximity/srf04.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/proximity/srf04.c b/drivers/iio/proximity/srf04.c
> index 4e6286765f01..05015351a34a 100644
> --- a/drivers/iio/proximity/srf04.c
> +++ b/drivers/iio/proximity/srf04.c
> @@ -37,9 +37,8 @@
> #include <linux/err.h>
> #include <linux/gpio/consumer.h>
> #include <linux/kernel.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/module.h>
> -#include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/property.h>
> #include <linux/sched.h>
> @@ -261,7 +260,7 @@ static int srf04_probe(struct platform_device *pdev)
>
> data = iio_priv(indio_dev);
> data->dev = dev;
> - data->cfg = of_match_device(of_srf04_match, dev)->data;
> + data->cfg = device_get_match_data(dev);
>
> mutex_init(&data->lock);
> init_completion(&data->rising);
> @@ -289,10 +288,8 @@ static int srf04_probe(struct platform_device *pdev)
> return PTR_ERR(data->gpiod_power);
> }
> if (data->gpiod_power) {
> -
> - if (of_property_read_u32(dev->of_node, "startup-time-ms",
> - &data->startup_time_ms))
> - data->startup_time_ms = 100;
> + data->startup_time_ms = 100;
> + device_property_read_u32(dev, "startup-time-ms", &data->startup_time_ms);
> dev_dbg(dev, "using power gpio: startup-time-ms=%d\n",
> data->startup_time_ms);
> }
