media: i2c: rdacm2x: Make use of device properties

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

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c
index b8bd8354d100a8e2824baece783b19db27eeb2c9..52e8e2620b4d47415e168f9ca108763a212f9f0b 100644 (file)
--- a/drivers/media/i2c/rdacm20.c
+++ b/drivers/media/i2c/rdacm20.c
@@ -16,10 +16,10 @@
  */
 
 #include <linux/delay.h>
-#include <linux/fwnode.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 
@@ -575,10 +575,9 @@ static int rdacm20_probe(struct i2c_client *client)
        dev->dev = &client->dev;
        dev->serializer.client = client;
 
-       ret = of_property_read_u32_array(client->dev.of_node, "reg",
-                                        dev->addrs, 2);
+       ret = device_property_read_u32_array(dev->dev, "reg", dev->addrs, 2);
        if (ret < 0) {
-               dev_err(dev->dev, "Invalid DT reg property: %d\n", ret);
+               dev_err(dev->dev, "Invalid FW reg property: %d\n", ret);
                return -EINVAL;
        }
 

diff --git a/drivers/media/i2c/rdacm21.c b/drivers/media/i2c/rdacm21.c
index 3e22df36354fdbd03e828d61d652903f854ff098..bcab462708c7020f84dc9ba4cbfe52b9cc2bdfae 100644 (file)
--- a/drivers/media/i2c/rdacm21.c
+++ b/drivers/media/i2c/rdacm21.c
@@ -11,10 +11,10 @@
  */
 
 #include <linux/delay.h>
-#include <linux/fwnode.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 
@@ -551,10 +551,9 @@ static int rdacm21_probe(struct i2c_client *client)
        dev->dev = &client->dev;
        dev->serializer.client = client;
 
-       ret = of_property_read_u32_array(client->dev.of_node, "reg",
-                                        dev->addrs, 2);
+       ret = device_property_read_u32_array(dev->dev, "reg", dev->addrs, 2);
        if (ret < 0) {
-               dev_err(dev->dev, "Invalid DT reg property: %d\n", ret);
+               dev_err(dev->dev, "Invalid FW reg property: %d\n", ret);
                return -EINVAL;
        }