Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Laxman Dewangan and committed by
Linus Walleij
251e22ab 12ba4082

+3 -6
+3 -6
drivers/pinctrl/pinctrl-amd.c
··· 783 783 gpio_dev->ngroups = ARRAY_SIZE(kerncz_groups); 784 784 785 785 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); 788 788 if (IS_ERR(gpio_dev->pctrl)) { 789 789 dev_err(&pdev->dev, "Couldn't register pinctrl driver\n"); 790 790 return PTR_ERR(gpio_dev->pctrl); ··· 792 792 793 793 ret = gpiochip_add_data(&gpio_dev->gc, gpio_dev); 794 794 if (ret) 795 - goto out1; 795 + return ret; 796 796 797 797 ret = gpiochip_add_pin_range(&gpio_dev->gc, dev_name(&pdev->dev), 798 798 0, 0, TOTAL_NUMBER_OF_PINS); ··· 825 825 out2: 826 826 gpiochip_remove(&gpio_dev->gc); 827 827 828 - out1: 829 - pinctrl_unregister(gpio_dev->pctrl); 830 828 return ret; 831 829 } 832 830 ··· 835 837 gpio_dev = platform_get_drvdata(pdev); 836 838 837 839 gpiochip_remove(&gpio_dev->gc); 838 - pinctrl_unregister(gpio_dev->pctrl); 839 840 840 841 return 0; 841 842 }