On Mon Mar 31 11:35:04 2025 +0300, Andy Shevchenko wrote:
> Convert the module to be property provider agnostic and allow
> it to be used on non-OF platforms.
> 
> Reviewed-by: Kieran Bingham <kieran.bingham+rene...@ideasonboard.com>
> Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart+rene...@ideasonboard.com>
> Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
> Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>

Patch committed.

Thanks,
Hans Verkuil

 drivers/media/i2c/rdacm20.c | 7 +++----
 drivers/media/i2c/rdacm21.c | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

---

diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c
index b8bd8354d100..52e8e2620b4d 100644
--- 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 3e22df36354f..bcab462708c7 100644
--- 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;
        }
 

Reply via email to