i2c: rtl9300: two cleanups

[PATCH 2/2] i2c: rtl9300: use of instead of fwnode

Posted by Rosen Penev 1 month, 3 weeks ago

Avoids having to use to_of_node and just assign directly. This is an OF
only driver anyway.

Use _scoped for the for each loop to avoid refcount leaks.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/i2c/busses/i2c-rtl9300.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
index f2aa341a7cdd..672cb978066d 100644
--- a/drivers/i2c/busses/i2c-rtl9300.c
+++ b/drivers/i2c/busses/i2c-rtl9300.c
@@ -371,7 +371,6 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct rtl9300_i2c *i2c;
-	struct fwnode_handle *child;
 	const struct rtl9300_i2c_drv_data *drv_data;
 	struct reg_field fields[F_NUM_FIELDS];
 	u32 clock_freq, scl_num, sda_num;
@@ -415,15 +414,15 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
 		return ret;
 
 	i = 0;
-	device_for_each_child_node(dev, child) {
+	for_each_child_of_node_scoped(dev->of_node, child) {
 		struct rtl9300_i2c_chan *chan = &i2c->chans[i];
 		struct i2c_adapter *adap = &chan->adap;
 
-		ret = fwnode_property_read_u32(child, "reg", &sda_num);
+		ret = of_property_read_u32(child, "reg", &sda_num);
 		if (ret)
 			return ret;
 
-		ret = fwnode_property_read_u32(child, "clock-frequency", &clock_freq);
+		ret = of_property_read_u32(child, "clock-frequency", &clock_freq);
 		if (ret)
 			clock_freq = I2C_MAX_STANDARD_MODE_FREQ;
 
@@ -449,7 +448,7 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
 		adap->retries = 3;
 		adap->dev.parent = dev;
 		i2c_set_adapdata(adap, chan);
-		adap->dev.of_node = to_of_node(child);
+		adap->dev.of_node = child;
 		snprintf(adap->name, sizeof(adap->name), "%s SDA%d\n", dev_name(dev), sda_num);
 		i++;
 
-- 
2.52.0

Re: [PATCH 2/2] i2c: rtl9300: use of instead of fwnode

Posted by Chris Packham 1 month, 3 weeks ago

Hi Rosen,

On 17/12/2025 19:30, Rosen Penev wrote:
> Avoids having to use to_of_node and just assign directly. This is an OF
> only driver anyway.
>
> Use _scoped for the for each loop to avoid refcount leaks.
>
> Signed-off-by: Rosen Penev <rosenp@gmail.com>

I thought the trend was to move to the more generic device properties 
rather than using of_ specific APIs which is why I wrote the driver 
using them. I agree that this driver is unlikely to be used on any 
platform that doesn't use a device tree so if Andi is happy with this 
I'm fine with the change.

Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>

> ---
>   drivers/i2c/busses/i2c-rtl9300.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
> index f2aa341a7cdd..672cb978066d 100644
> --- a/drivers/i2c/busses/i2c-rtl9300.c
> +++ b/drivers/i2c/busses/i2c-rtl9300.c
> @@ -371,7 +371,6 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
>   {
>   	struct device *dev = &pdev->dev;
>   	struct rtl9300_i2c *i2c;
> -	struct fwnode_handle *child;
>   	const struct rtl9300_i2c_drv_data *drv_data;
>   	struct reg_field fields[F_NUM_FIELDS];
>   	u32 clock_freq, scl_num, sda_num;
> @@ -415,15 +414,15 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
>   		return ret;
>   
>   	i = 0;
> -	device_for_each_child_node(dev, child) {
> +	for_each_child_of_node_scoped(dev->of_node, child) {
>   		struct rtl9300_i2c_chan *chan = &i2c->chans[i];
>   		struct i2c_adapter *adap = &chan->adap;
>   
> -		ret = fwnode_property_read_u32(child, "reg", &sda_num);
> +		ret = of_property_read_u32(child, "reg", &sda_num);
>   		if (ret)
>   			return ret;
>   
> -		ret = fwnode_property_read_u32(child, "clock-frequency", &clock_freq);
> +		ret = of_property_read_u32(child, "clock-frequency", &clock_freq);
>   		if (ret)
>   			clock_freq = I2C_MAX_STANDARD_MODE_FREQ;
>   
> @@ -449,7 +448,7 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
>   		adap->retries = 3;
>   		adap->dev.parent = dev;
>   		i2c_set_adapdata(adap, chan);
> -		adap->dev.of_node = to_of_node(child);
> +		adap->dev.of_node = child;
>   		snprintf(adap->name, sizeof(adap->name), "%s SDA%d\n", dev_name(dev), sda_num);
>   		i++;
>

Re: [PATCH 2/2] i2c: rtl9300: use of instead of fwnode

Posted by Rosen Penev 1 month, 3 weeks ago

On Wed, Dec 17, 2025 at 11:43 AM Chris Packham
<Chris.Packham@alliedtelesis.co.nz> wrote:
>
> Hi Rosen,
>
> On 17/12/2025 19:30, Rosen Penev wrote:
> > Avoids having to use to_of_node and just assign directly. This is an OF
> > only driver anyway.
> >
> > Use _scoped for the for each loop to avoid refcount leaks.
> >
> > Signed-off-by: Rosen Penev <rosenp@gmail.com>
>
> I thought the trend was to move to the more generic device properties
> rather than using of_ specific APIs which is why I wrote the driver
> using them. I agree that this driver is unlikely to be used on any
> platform that doesn't use a device tree so if Andi is happy with this
> I'm fine with the change.
I've gotten the opposite advice on netdev before.
>
> Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
>
> > ---
> >   drivers/i2c/busses/i2c-rtl9300.c | 9 ++++-----
> >   1 file changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
> > index f2aa341a7cdd..672cb978066d 100644
> > --- a/drivers/i2c/busses/i2c-rtl9300.c
> > +++ b/drivers/i2c/busses/i2c-rtl9300.c
> > @@ -371,7 +371,6 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
> >   {
> >       struct device *dev = &pdev->dev;
> >       struct rtl9300_i2c *i2c;
> > -     struct fwnode_handle *child;
> >       const struct rtl9300_i2c_drv_data *drv_data;
> >       struct reg_field fields[F_NUM_FIELDS];
> >       u32 clock_freq, scl_num, sda_num;
> > @@ -415,15 +414,15 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
> >               return ret;
> >
> >       i = 0;
> > -     device_for_each_child_node(dev, child) {
> > +     for_each_child_of_node_scoped(dev->of_node, child) {
> >               struct rtl9300_i2c_chan *chan = &i2c->chans[i];
> >               struct i2c_adapter *adap = &chan->adap;
> >
> > -             ret = fwnode_property_read_u32(child, "reg", &sda_num);
> > +             ret = of_property_read_u32(child, "reg", &sda_num);
> >               if (ret)
> >                       return ret;
> >
> > -             ret = fwnode_property_read_u32(child, "clock-frequency", &clock_freq);
> > +             ret = of_property_read_u32(child, "clock-frequency", &clock_freq);
> >               if (ret)
> >                       clock_freq = I2C_MAX_STANDARD_MODE_FREQ;
> >
> > @@ -449,7 +448,7 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
> >               adap->retries = 3;
> >               adap->dev.parent = dev;
> >               i2c_set_adapdata(adap, chan);
> > -             adap->dev.of_node = to_of_node(child);
> > +             adap->dev.of_node = child;
> >               snprintf(adap->name, sizeof(adap->name), "%s SDA%d\n", dev_name(dev), sda_num);
> >               i++;
> >