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

pinctrl: imx: 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: Shawn Guo <shawnguo@kernel.org>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Adrian Alonso <aalonso@freescale.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Laxman Dewangan and committed by
Linus Walleij
a4b0f457 7e73f819

+1 -23
+1 -10
drivers/pinctrl/freescale/pinctrl-imx.c
··· 790 790 ipctl->info = info; 791 791 ipctl->dev = info->dev; 792 792 platform_set_drvdata(pdev, ipctl); 793 - ipctl->pctl = pinctrl_register(&imx_pinctrl_desc, &pdev->dev, ipctl); 793 + ipctl->pctl = devm_pinctrl_register(&pdev->dev, &imx_pinctrl_desc, ipctl); 794 794 if (IS_ERR(ipctl->pctl)) { 795 795 dev_err(&pdev->dev, "could not register IMX pinctrl driver\n"); 796 796 return PTR_ERR(ipctl->pctl); 797 797 } 798 798 799 799 dev_info(&pdev->dev, "initialized IMX pinctrl driver\n"); 800 - 801 - return 0; 802 - } 803 - 804 - int imx_pinctrl_remove(struct platform_device *pdev) 805 - { 806 - struct imx_pinctrl *ipctl = platform_get_drvdata(pdev); 807 - 808 - pinctrl_unregister(ipctl->pctl); 809 800 810 801 return 0; 811 802 }
-1
drivers/pinctrl/freescale/pinctrl-imx.h
··· 99 99 100 100 int imx_pinctrl_probe(struct platform_device *pdev, 101 101 struct imx_pinctrl_soc_info *info); 102 - int imx_pinctrl_remove(struct platform_device *pdev); 103 102 #endif /* __DRIVERS_PINCTRL_IMX_H */
-1
drivers/pinctrl/freescale/pinctrl-imx25.c
··· 331 331 .of_match_table = of_match_ptr(imx25_pinctrl_of_match), 332 332 }, 333 333 .probe = imx25_pinctrl_probe, 334 - .remove = imx_pinctrl_remove, 335 334 }; 336 335 337 336 static int __init imx25_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx35.c
··· 1021 1021 .of_match_table = imx35_pinctrl_of_match, 1022 1022 }, 1023 1023 .probe = imx35_pinctrl_probe, 1024 - .remove = imx_pinctrl_remove, 1025 1024 }; 1026 1025 1027 1026 static int __init imx35_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx50.c
··· 408 408 .of_match_table = of_match_ptr(imx50_pinctrl_of_match), 409 409 }, 410 410 .probe = imx50_pinctrl_probe, 411 - .remove = imx_pinctrl_remove, 412 411 }; 413 412 414 413 static int __init imx50_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx51.c
··· 784 784 .of_match_table = imx51_pinctrl_of_match, 785 785 }, 786 786 .probe = imx51_pinctrl_probe, 787 - .remove = imx_pinctrl_remove, 788 787 }; 789 788 790 789 static int __init imx51_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx53.c
··· 471 471 .of_match_table = imx53_pinctrl_of_match, 472 472 }, 473 473 .probe = imx53_pinctrl_probe, 474 - .remove = imx_pinctrl_remove, 475 474 }; 476 475 477 476 static int __init imx53_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx6dl.c
··· 477 477 .of_match_table = imx6dl_pinctrl_of_match, 478 478 }, 479 479 .probe = imx6dl_pinctrl_probe, 480 - .remove = imx_pinctrl_remove, 481 480 }; 482 481 483 482 static int __init imx6dl_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx6q.c
··· 483 483 .of_match_table = imx6q_pinctrl_of_match, 484 484 }, 485 485 .probe = imx6q_pinctrl_probe, 486 - .remove = imx_pinctrl_remove, 487 486 }; 488 487 489 488 static int __init imx6q_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx6sl.c
··· 384 384 .of_match_table = imx6sl_pinctrl_of_match, 385 385 }, 386 386 .probe = imx6sl_pinctrl_probe, 387 - .remove = imx_pinctrl_remove, 388 387 }; 389 388 390 389 static int __init imx6sl_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx6sx.c
··· 387 387 .of_match_table = of_match_ptr(imx6sx_pinctrl_of_match), 388 388 }, 389 389 .probe = imx6sx_pinctrl_probe, 390 - .remove = imx_pinctrl_remove, 391 390 }; 392 391 393 392 static int __init imx6sx_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx6ul.c
··· 303 303 .of_match_table = of_match_ptr(imx6ul_pinctrl_of_match), 304 304 }, 305 305 .probe = imx6ul_pinctrl_probe, 306 - .remove = imx_pinctrl_remove, 307 306 }; 308 307 309 308 static int __init imx6ul_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-imx7d.c
··· 395 395 .of_match_table = of_match_ptr(imx7d_pinctrl_of_match), 396 396 }, 397 397 .probe = imx7d_pinctrl_probe, 398 - .remove = imx_pinctrl_remove, 399 398 }; 400 399 401 400 static int __init imx7d_pinctrl_init(void)
-1
drivers/pinctrl/freescale/pinctrl-vf610.c
··· 318 318 .of_match_table = vf610_pinctrl_of_match, 319 319 }, 320 320 .probe = vf610_pinctrl_probe, 321 - .remove = imx_pinctrl_remove, 322 321 }; 323 322 324 323 static int __init vf610_pinctrl_init(void)