of: unittest: Switch to use fwnode instead of of_node
Subsystems (2)
PATCH v4 1/2 of: unittest: Switch to use fwnode instead of of_node
The OF node in the GPIO library is deprecated and soon will be removed. GPIO library now accepts fwnode as a firmware node, so switch the module to use it instead.
---
v2: added tag (Bart), clarify the purpose in the commit message (Rob)
drivers/of/unittest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/of/unittest.c +2 -2
@@ -1602,7 +1602,7 @@ static int unittest_gpio_probe(struct platform_device *pdev)platform_set_drvdata (pdev, devptr); - devptr->chip.of_node = pdev->dev.of_node; + devptr->chip.fwnode =dev_fwnode (&pdev->dev); devptr->chip.label ="of-unittest-gpio" ; devptr->chip.base =-1 ;/* dynamic allocation */ devptr->chip.ngpio =5 ;
@@ -1611,7 +1611,7 @@ static int unittest_gpio_probe(struct platform_device *pdev) ret =gpiochip_add_data (&devptr->chip,NULL );unittest (!ret, -"gpiochip_add_data() for node @%pOF failed, ret = %d\n" , devptr->chip.of_node, ret); +"gpiochip_add_data() for node @%pfw failed, ret = %d\n" , devptr->chip.fwnode, ret);if (!ret) unittest_gpio_probe_pass_count++;
Signature · 1 line
2.35.1
PATCH v4 2/2 of: unittest: make unittest_gpio_remove() consistent with unittest_gpio_probe()
On the ->remove() stage the callback uses physical device node instead of one from GPIO chip and the variable name which is different to one used in unittest_gpio_probe(). Make these consistent with unittest_gpio_probe().
---
v2: no changes
drivers/of/unittest.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/of/unittest.c +6 -7
@@ -1620,20 +1620,19 @@ static int unittest_gpio_probe(struct platform_device *pdev)static int unittest_gpio_remove (struct platform_device *pdev) { -struct unittest_gpio_dev *gdev =platform_get_drvdata (pdev); +struct unittest_gpio_dev *devptr =platform_get_drvdata (pdev);struct device *dev = &pdev->dev; -struct device_node *np = pdev->dev.of_node; -dev_dbg (dev,"%s for node @%pOF\n" , __func__, np); +dev_dbg (dev,"%s for node @%pfw\n" , __func__, devptr->chip.fwnode); -if (!gdev) +if (!devptr)return -EINVAL ; -if (gdev->chip.base !=-1 ) -gpiochip_remove (&gdev->chip); +if (devptr->chip.base !=-1 ) +gpiochip_remove (&devptr->chip);platform_set_drvdata (pdev,NULL ); -kfree (gdev); +kfree (devptr);return 0 ; }
Signature · 1 line
2.35.1
Re: [PATCH v4 2/2] of: unittest: make unittest_gpio_remove() consistent with unittest_gpio_probe()
Quoted 10 lines · Andy Shevchenko
On the ->remove() stage the callback uses physical device node instead of one from GPIO chip and the variable name which is different to one used in
unittest_gpio_probe(). Make these consistent withunittest_gpio_probe().Signed-off-by Andy Shevchenko <[email protected]>---
v2: no changesdrivers/of/unittest.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
Applied, thanks!
Quoted 11 lines · Andy Shevchenko
The OF node in the GPIO library is deprecated and soon will be removed. GPIO library now accepts fwnode as a firmware node, so switch the module to use it instead.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Bartosz Golaszewski <[email protected]>---
v2: added tag (Bart), clarify the purpose in the commit message (Rob)drivers/of/unittest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks!