| Message ID | 20220708214539.7254-2-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 9465a98458fe2a05015bc90d7587fb891cd0c0cc |
| Headers | show |
| Series | [v4,1/2] of: unittest: Switch to use fwnode instead of of_node | expand |
On Sat, 09 Jul 2022 00:45:39 +0300, Andy Shevchenko wrote: > 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(). > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > v2: no changes > drivers/of/unittest.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > Applied, thanks!
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 5a842dfc27e8..eafa8ffefbd0 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -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; }
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(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: no changes drivers/of/unittest.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)