mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
pinctrl: as3722: Use devm_gpiochip_add_data() to simplify remove path
Use devm version of gpiochip add function to handle removal for us. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Andy Shevchenko <andy@kernel.org> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Link: https://lore.kernel.org/r/20231116223045.274211-1-afd@ti.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
05e4941d97
commit
c3c63e6652
1 changed files with 2 additions and 15 deletions
|
@ -542,7 +542,6 @@ static int as3722_pinctrl_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
as_pci->dev = &pdev->dev;
|
as_pci->dev = &pdev->dev;
|
||||||
as_pci->as3722 = dev_get_drvdata(pdev->dev.parent);
|
as_pci->as3722 = dev_get_drvdata(pdev->dev.parent);
|
||||||
platform_set_drvdata(pdev, as_pci);
|
|
||||||
|
|
||||||
as_pci->pins = as3722_pins_desc;
|
as_pci->pins = as3722_pins_desc;
|
||||||
as_pci->num_pins = ARRAY_SIZE(as3722_pins_desc);
|
as_pci->num_pins = ARRAY_SIZE(as3722_pins_desc);
|
||||||
|
@ -562,7 +561,7 @@ static int as3722_pinctrl_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
as_pci->gpio_chip = as3722_gpio_chip;
|
as_pci->gpio_chip = as3722_gpio_chip;
|
||||||
as_pci->gpio_chip.parent = &pdev->dev;
|
as_pci->gpio_chip.parent = &pdev->dev;
|
||||||
ret = gpiochip_add_data(&as_pci->gpio_chip, as_pci);
|
ret = devm_gpiochip_add_data(&pdev->dev, &as_pci->gpio_chip, as_pci);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "Couldn't register gpiochip, %d\n", ret);
|
dev_err(&pdev->dev, "Couldn't register gpiochip, %d\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -572,21 +571,10 @@ static int as3722_pinctrl_probe(struct platform_device *pdev)
|
||||||
0, 0, AS3722_PIN_NUM);
|
0, 0, AS3722_PIN_NUM);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "Couldn't add pin range, %d\n", ret);
|
dev_err(&pdev->dev, "Couldn't add pin range, %d\n", ret);
|
||||||
goto fail_range_add;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
fail_range_add:
|
|
||||||
gpiochip_remove(&as_pci->gpio_chip);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void as3722_pinctrl_remove(struct platform_device *pdev)
|
return 0;
|
||||||
{
|
|
||||||
struct as3722_pctrl_info *as_pci = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
gpiochip_remove(&as_pci->gpio_chip);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id as3722_pinctrl_of_match[] = {
|
static const struct of_device_id as3722_pinctrl_of_match[] = {
|
||||||
|
@ -601,7 +589,6 @@ static struct platform_driver as3722_pinctrl_driver = {
|
||||||
.of_match_table = as3722_pinctrl_of_match,
|
.of_match_table = as3722_pinctrl_of_match,
|
||||||
},
|
},
|
||||||
.probe = as3722_pinctrl_probe,
|
.probe = as3722_pinctrl_probe,
|
||||||
.remove_new = as3722_pinctrl_remove,
|
|
||||||
};
|
};
|
||||||
module_platform_driver(as3722_pinctrl_driver);
|
module_platform_driver(as3722_pinctrl_driver);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue