Skip to content

Commit 251e22a

Browse files
ldewanganlinusw
authored andcommitted
pinctrl: amd: Use devm_pinctrl_register() for pinctrl registration
Use devm_pinctrl_register() for pin control registration and clean error path. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 12ba408 commit 251e22a

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

Diff for: drivers/pinctrl/pinctrl-amd.c

+3-6
Original file line numberDiff line numberDiff line change
@@ -783,16 +783,16 @@ static int amd_gpio_probe(struct platform_device *pdev)
783783
gpio_dev->ngroups = ARRAY_SIZE(kerncz_groups);
784784

785785
amd_pinctrl_desc.name = dev_name(&pdev->dev);
786-
gpio_dev->pctrl = pinctrl_register(&amd_pinctrl_desc,
787-
&pdev->dev, gpio_dev);
786+
gpio_dev->pctrl = devm_pinctrl_register(&pdev->dev, &amd_pinctrl_desc,
787+
gpio_dev);
788788
if (IS_ERR(gpio_dev->pctrl)) {
789789
dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
790790
return PTR_ERR(gpio_dev->pctrl);
791791
}
792792

793793
ret = gpiochip_add_data(&gpio_dev->gc, gpio_dev);
794794
if (ret)
795-
goto out1;
795+
return ret;
796796

797797
ret = gpiochip_add_pin_range(&gpio_dev->gc, dev_name(&pdev->dev),
798798
0, 0, TOTAL_NUMBER_OF_PINS);
@@ -825,8 +825,6 @@ static int amd_gpio_probe(struct platform_device *pdev)
825825
out2:
826826
gpiochip_remove(&gpio_dev->gc);
827827

828-
out1:
829-
pinctrl_unregister(gpio_dev->pctrl);
830828
return ret;
831829
}
832830

@@ -837,7 +835,6 @@ static int amd_gpio_remove(struct platform_device *pdev)
837835
gpio_dev = platform_get_drvdata(pdev);
838836

839837
gpiochip_remove(&gpio_dev->gc);
840-
pinctrl_unregister(gpio_dev->pctrl);
841838

842839
return 0;
843840
}

0 commit comments

Comments
 (0)