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

pinctrl: spear: Use devm_pinctrl_register() for pinctrl registration

Use devm_pinctrl_register() for pin control registration and remove
need of .remove callback.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Viresh Kumar <vireshk@kernel.org>
Cc: spear-devel@list.st.com
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Laxman Dewangan and committed by
Linus Walleij
d39de313 67ec8d7b

+1 -41
+1 -10
drivers/pinctrl/spear/pinctrl-spear.c
··· 395 395 spear_pinctrl_desc.pins = machdata->pins; 396 396 spear_pinctrl_desc.npins = machdata->npins; 397 397 398 - pmx->pctl = pinctrl_register(&spear_pinctrl_desc, &pdev->dev, pmx); 398 + pmx->pctl = devm_pinctrl_register(&pdev->dev, &spear_pinctrl_desc, pmx); 399 399 if (IS_ERR(pmx->pctl)) { 400 400 dev_err(&pdev->dev, "Couldn't register pinctrl driver\n"); 401 401 return PTR_ERR(pmx->pctl); 402 402 } 403 - 404 - return 0; 405 - } 406 - 407 - int spear_pinctrl_remove(struct platform_device *pdev) 408 - { 409 - struct spear_pmx *pmx = platform_get_drvdata(pdev); 410 - 411 - pinctrl_unregister(pmx->pctl); 412 403 413 404 return 0; 414 405 }
-1
drivers/pinctrl/spear/pinctrl-spear.h
··· 197 197 unsigned count, u16 reg); 198 198 int spear_pinctrl_probe(struct platform_device *pdev, 199 199 struct spear_pinctrl_machdata *machdata); 200 - int spear_pinctrl_remove(struct platform_device *pdev); 201 200 202 201 #define SPEAR_PIN_0_TO_101 \ 203 202 PINCTRL_PIN(0, "PLGPIO0"), \
-6
drivers/pinctrl/spear/pinctrl-spear1310.c
··· 2704 2704 return spear_pinctrl_probe(pdev, &spear1310_machdata); 2705 2705 } 2706 2706 2707 - static int spear1310_pinctrl_remove(struct platform_device *pdev) 2708 - { 2709 - return spear_pinctrl_remove(pdev); 2710 - } 2711 - 2712 2707 static struct platform_driver spear1310_pinctrl_driver = { 2713 2708 .driver = { 2714 2709 .name = DRIVER_NAME, 2715 2710 .of_match_table = spear1310_pinctrl_of_match, 2716 2711 }, 2717 2712 .probe = spear1310_pinctrl_probe, 2718 - .remove = spear1310_pinctrl_remove, 2719 2713 }; 2720 2714 2721 2715 static int __init spear1310_pinctrl_init(void)
-6
drivers/pinctrl/spear/pinctrl-spear1340.c
··· 2020 2020 return spear_pinctrl_probe(pdev, &spear1340_machdata); 2021 2021 } 2022 2022 2023 - static int spear1340_pinctrl_remove(struct platform_device *pdev) 2024 - { 2025 - return spear_pinctrl_remove(pdev); 2026 - } 2027 - 2028 2023 static struct platform_driver spear1340_pinctrl_driver = { 2029 2024 .driver = { 2030 2025 .name = DRIVER_NAME, 2031 2026 .of_match_table = spear1340_pinctrl_of_match, 2032 2027 }, 2033 2028 .probe = spear1340_pinctrl_probe, 2034 - .remove = spear1340_pinctrl_remove, 2035 2029 }; 2036 2030 2037 2031 static int __init spear1340_pinctrl_init(void)
-6
drivers/pinctrl/spear/pinctrl-spear300.c
··· 677 677 return 0; 678 678 } 679 679 680 - static int spear300_pinctrl_remove(struct platform_device *pdev) 681 - { 682 - return spear_pinctrl_remove(pdev); 683 - } 684 - 685 680 static struct platform_driver spear300_pinctrl_driver = { 686 681 .driver = { 687 682 .name = DRIVER_NAME, 688 683 .of_match_table = spear300_pinctrl_of_match, 689 684 }, 690 685 .probe = spear300_pinctrl_probe, 691 - .remove = spear300_pinctrl_remove, 692 686 }; 693 687 694 688 static int __init spear300_pinctrl_init(void)
-6
drivers/pinctrl/spear/pinctrl-spear310.c
··· 400 400 return 0; 401 401 } 402 402 403 - static int spear310_pinctrl_remove(struct platform_device *pdev) 404 - { 405 - return spear_pinctrl_remove(pdev); 406 - } 407 - 408 403 static struct platform_driver spear310_pinctrl_driver = { 409 404 .driver = { 410 405 .name = DRIVER_NAME, 411 406 .of_match_table = spear310_pinctrl_of_match, 412 407 }, 413 408 .probe = spear310_pinctrl_probe, 414 - .remove = spear310_pinctrl_remove, 415 409 }; 416 410 417 411 static int __init spear310_pinctrl_init(void)
-6
drivers/pinctrl/spear/pinctrl-spear320.c
··· 3441 3441 return 0; 3442 3442 } 3443 3443 3444 - static int spear320_pinctrl_remove(struct platform_device *pdev) 3445 - { 3446 - return spear_pinctrl_remove(pdev); 3447 - } 3448 - 3449 3444 static struct platform_driver spear320_pinctrl_driver = { 3450 3445 .driver = { 3451 3446 .name = DRIVER_NAME, 3452 3447 .of_match_table = spear320_pinctrl_of_match, 3453 3448 }, 3454 3449 .probe = spear320_pinctrl_probe, 3455 - .remove = spear320_pinctrl_remove, 3456 3450 }; 3457 3451 3458 3452 static int __init spear320_pinctrl_init(void)