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

pinctrl: sunxi: make bool drivers explicitly non-modular

None of the Kconfigs for any of these drivers are tristate,
meaning that they currently are not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the drivers there is no doubt they are builtin-only. All
drivers get essentially the same change, so they are handled in batch.

Changes are (1) use builtin_platform_driver, (2) use init.h header
(3) delete module_exit related code, (4) delete MODULE_DEVICE_TABLE,
and (5) delete MODULE_LICENCE/MODULE_AUTHOR and associated tags.

Since module_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

We do delete the MODULE_LICENSE etc. tags since all that information
is already contained at the top of each file in the comments.

Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Hongzhou Yang <hongzhou.yang@mediatek.com>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Maxime Coquelin <maxime.coquelin@st.com>
Cc: Vishnu Patekar <vishnupatekar0510@gmail.com>
Cc: Mylene Josserand <mylene.josserand@free-electrons.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Paul Gortmaker and committed by
Linus Walleij
0c8c6ba0 0f15f500

+26 -95
+2 -7
drivers/pinctrl/sunxi/pinctrl-gr8.c
··· 12 12 * warranty of any kind, whether express or implied. 13 13 */ 14 14 15 - #include <linux/module.h> 15 + #include <linux/init.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/of.h> 18 18 #include <linux/of_device.h> ··· 525 525 { .compatible = "nextthing,gr8-pinctrl", }, 526 526 {} 527 527 }; 528 - MODULE_DEVICE_TABLE(of, sun5i_gr8_pinctrl_match); 529 528 530 529 static struct platform_driver sun5i_gr8_pinctrl_driver = { 531 530 .probe = sun5i_gr8_pinctrl_probe, ··· 533 534 .of_match_table = sun5i_gr8_pinctrl_match, 534 535 }, 535 536 }; 536 - module_platform_driver(sun5i_gr8_pinctrl_driver); 537 - 538 - MODULE_AUTHOR("Mylene Josserand <mylene.josserand@free-electrons.com"); 539 - MODULE_DESCRIPTION("NextThing GR8 pinctrl driver"); 540 - MODULE_LICENSE("GPL"); 537 + builtin_platform_driver(sun5i_gr8_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
··· 10 10 * warranty of any kind, whether express or implied. 11 11 */ 12 12 13 - #include <linux/module.h> 13 + #include <linux/init.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_device.h> ··· 1035 1035 { .compatible = "allwinner,sun4i-a10-pinctrl", }, 1036 1036 {} 1037 1037 }; 1038 - MODULE_DEVICE_TABLE(of, sun4i_a10_pinctrl_match); 1039 1038 1040 1039 static struct platform_driver sun4i_a10_pinctrl_driver = { 1041 1040 .probe = sun4i_a10_pinctrl_probe, ··· 1043 1044 .of_match_table = sun4i_a10_pinctrl_match, 1044 1045 }, 1045 1046 }; 1046 - module_platform_driver(sun4i_a10_pinctrl_driver); 1047 - 1048 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 1049 - MODULE_DESCRIPTION("Allwinner A10 pinctrl driver"); 1050 - MODULE_LICENSE("GPL"); 1047 + builtin_platform_driver(sun4i_a10_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
··· 10 10 * warranty of any kind, whether express or implied. 11 11 */ 12 12 13 - #include <linux/module.h> 13 + #include <linux/init.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_device.h> ··· 674 674 { .compatible = "allwinner,sun5i-a10s-pinctrl", }, 675 675 {} 676 676 }; 677 - MODULE_DEVICE_TABLE(of, sun5i_a10s_pinctrl_match); 678 677 679 678 static struct platform_driver sun5i_a10s_pinctrl_driver = { 680 679 .probe = sun5i_a10s_pinctrl_probe, ··· 682 683 .of_match_table = sun5i_a10s_pinctrl_match, 683 684 }, 684 685 }; 685 - module_platform_driver(sun5i_a10s_pinctrl_driver); 686 - 687 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 688 - MODULE_DESCRIPTION("Allwinner A10s pinctrl driver"); 689 - MODULE_LICENSE("GPL"); 686 + builtin_platform_driver(sun5i_a10s_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
··· 10 10 * warranty of any kind, whether express or implied. 11 11 */ 12 12 13 - #include <linux/module.h> 13 + #include <linux/init.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_device.h> ··· 392 392 { .compatible = "allwinner,sun5i-a13-pinctrl", }, 393 393 {} 394 394 }; 395 - MODULE_DEVICE_TABLE(of, sun5i_a13_pinctrl_match); 396 395 397 396 static struct platform_driver sun5i_a13_pinctrl_driver = { 398 397 .probe = sun5i_a13_pinctrl_probe, ··· 400 401 .of_match_table = sun5i_a13_pinctrl_match, 401 402 }, 402 403 }; 403 - module_platform_driver(sun5i_a13_pinctrl_driver); 404 - 405 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 406 - MODULE_DESCRIPTION("Allwinner A13 pinctrl driver"); 407 - MODULE_LICENSE("GPL"); 404 + builtin_platform_driver(sun5i_a13_pinctrl_driver);
+2 -8
drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
··· 12 12 * warranty of any kind, whether express or implied. 13 13 */ 14 14 15 - #include <linux/module.h> 15 + #include <linux/init.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/of.h> 18 18 #include <linux/of_device.h> ··· 136 136 { .compatible = "allwinner,sun6i-a31-r-pinctrl", }, 137 137 {} 138 138 }; 139 - MODULE_DEVICE_TABLE(of, sun6i_a31_r_pinctrl_match); 140 139 141 140 static struct platform_driver sun6i_a31_r_pinctrl_driver = { 142 141 .probe = sun6i_a31_r_pinctrl_probe, ··· 144 145 .of_match_table = sun6i_a31_r_pinctrl_match, 145 146 }, 146 147 }; 147 - module_platform_driver(sun6i_a31_r_pinctrl_driver); 148 - 149 - MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com"); 150 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 151 - MODULE_DESCRIPTION("Allwinner A31 R_PIO pinctrl driver"); 152 - MODULE_LICENSE("GPL"); 148 + builtin_platform_driver(sun6i_a31_r_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
··· 10 10 * warranty of any kind, whether express or implied. 11 11 */ 12 12 13 - #include <linux/module.h> 13 + #include <linux/init.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_device.h> ··· 934 934 { .compatible = "allwinner,sun6i-a31-pinctrl", }, 935 935 {} 936 936 }; 937 - MODULE_DEVICE_TABLE(of, sun6i_a31_pinctrl_match); 938 937 939 938 static struct platform_driver sun6i_a31_pinctrl_driver = { 940 939 .probe = sun6i_a31_pinctrl_probe, ··· 942 943 .of_match_table = sun6i_a31_pinctrl_match, 943 944 }, 944 945 }; 945 - module_platform_driver(sun6i_a31_pinctrl_driver); 946 - 947 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 948 - MODULE_DESCRIPTION("Allwinner A31 pinctrl driver"); 949 - MODULE_LICENSE("GPL"); 946 + builtin_platform_driver(sun6i_a31_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
··· 11 11 * warranty of any kind, whether express or implied. 12 12 */ 13 13 14 - #include <linux/module.h> 14 + #include <linux/init.h> 15 15 #include <linux/platform_device.h> 16 16 #include <linux/of.h> 17 17 #include <linux/of_device.h> ··· 798 798 { .compatible = "allwinner,sun6i-a31s-pinctrl", }, 799 799 {} 800 800 }; 801 - MODULE_DEVICE_TABLE(of, sun6i_a31s_pinctrl_match); 802 801 803 802 static struct platform_driver sun6i_a31s_pinctrl_driver = { 804 803 .probe = sun6i_a31s_pinctrl_probe, ··· 806 807 .of_match_table = sun6i_a31s_pinctrl_match, 807 808 }, 808 809 }; 809 - module_platform_driver(sun6i_a31s_pinctrl_driver); 810 - 811 - MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); 812 - MODULE_DESCRIPTION("Allwinner A31s pinctrl driver"); 813 - MODULE_LICENSE("GPL"); 810 + builtin_platform_driver(sun6i_a31s_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
··· 10 10 * warranty of any kind, whether express or implied. 11 11 */ 12 12 13 - #include <linux/module.h> 13 + #include <linux/init.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_device.h> ··· 1045 1045 { .compatible = "allwinner,sun7i-a20-pinctrl", }, 1046 1046 {} 1047 1047 }; 1048 - MODULE_DEVICE_TABLE(of, sun7i_a20_pinctrl_match); 1049 1048 1050 1049 static struct platform_driver sun7i_a20_pinctrl_driver = { 1051 1050 .probe = sun7i_a20_pinctrl_probe, ··· 1053 1054 .of_match_table = sun7i_a20_pinctrl_match, 1054 1055 }, 1055 1056 }; 1056 - module_platform_driver(sun7i_a20_pinctrl_driver); 1057 - 1058 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 1059 - MODULE_DESCRIPTION("Allwinner A20 pinctrl driver"); 1060 - MODULE_LICENSE("GPL"); 1057 + builtin_platform_driver(sun7i_a20_pinctrl_driver);
+2 -9
drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
··· 15 15 * warranty of any kind, whether express or implied. 16 16 */ 17 17 18 - #include <linux/module.h> 18 + #include <linux/init.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/of.h> 21 21 #include <linux/of_device.h> ··· 123 123 { .compatible = "allwinner,sun8i-a23-r-pinctrl", }, 124 124 {} 125 125 }; 126 - MODULE_DEVICE_TABLE(of, sun8i_a23_r_pinctrl_match); 127 126 128 127 static struct platform_driver sun8i_a23_r_pinctrl_driver = { 129 128 .probe = sun8i_a23_r_pinctrl_probe, ··· 131 132 .of_match_table = sun8i_a23_r_pinctrl_match, 132 133 }, 133 134 }; 134 - module_platform_driver(sun8i_a23_r_pinctrl_driver); 135 - 136 - MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>"); 137 - MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com"); 138 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 139 - MODULE_DESCRIPTION("Allwinner A23 R_PIO pinctrl driver"); 140 - MODULE_LICENSE("GPL"); 135 + builtin_platform_driver(sun8i_a23_r_pinctrl_driver);
+2 -8
drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
··· 14 14 * warranty of any kind, whether express or implied. 15 15 */ 16 16 17 - #include <linux/module.h> 17 + #include <linux/init.h> 18 18 #include <linux/platform_device.h> 19 19 #include <linux/of.h> 20 20 #include <linux/of_device.h> ··· 575 575 { .compatible = "allwinner,sun8i-a23-pinctrl", }, 576 576 {} 577 577 }; 578 - MODULE_DEVICE_TABLE(of, sun8i_a23_pinctrl_match); 579 578 580 579 static struct platform_driver sun8i_a23_pinctrl_driver = { 581 580 .probe = sun8i_a23_pinctrl_probe, ··· 583 584 .of_match_table = sun8i_a23_pinctrl_match, 584 585 }, 585 586 }; 586 - module_platform_driver(sun8i_a23_pinctrl_driver); 587 - 588 - MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>"); 589 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com"); 590 - MODULE_DESCRIPTION("Allwinner A23 pinctrl driver"); 591 - MODULE_LICENSE("GPL"); 587 + builtin_platform_driver(sun8i_a23_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
··· 12 12 * warranty of any kind, whether express or implied. 13 13 */ 14 14 15 - #include <linux/module.h> 15 + #include <linux/init.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/of.h> 18 18 #include <linux/of_device.h> ··· 498 498 { .compatible = "allwinner,sun8i-a33-pinctrl", }, 499 499 {} 500 500 }; 501 - MODULE_DEVICE_TABLE(of, sun8i_a33_pinctrl_match); 502 501 503 502 static struct platform_driver sun8i_a33_pinctrl_driver = { 504 503 .probe = sun8i_a33_pinctrl_probe, ··· 506 507 .of_match_table = sun8i_a33_pinctrl_match, 507 508 }, 508 509 }; 509 - module_platform_driver(sun8i_a33_pinctrl_driver); 510 - 511 - MODULE_AUTHOR("Vishnu Patekar <vishnupatekar0510@gmail.com>"); 512 - MODULE_DESCRIPTION("Allwinner a33 pinctrl driver"); 513 - MODULE_LICENSE("GPL"); 510 + builtin_platform_driver(sun8i_a33_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
··· 12 12 * warranty of any kind, whether express or implied. 13 13 */ 14 14 15 - #include <linux/module.h> 15 + #include <linux/init.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/of.h> 18 18 #include <linux/of_device.h> ··· 587 587 { .compatible = "allwinner,sun8i-a83t-pinctrl", }, 588 588 {} 589 589 }; 590 - MODULE_DEVICE_TABLE(of, sun8i_a83t_pinctrl_match); 591 590 592 591 static struct platform_driver sun8i_a83t_pinctrl_driver = { 593 592 .probe = sun8i_a83t_pinctrl_probe, ··· 595 596 .of_match_table = sun8i_a83t_pinctrl_match, 596 597 }, 597 598 }; 598 - module_platform_driver(sun8i_a83t_pinctrl_driver); 599 - 600 - MODULE_AUTHOR("Vishnu Patekar <vishnupatekar0510@gmail.com>"); 601 - MODULE_DESCRIPTION("Allwinner a83t pinctrl driver"); 602 - MODULE_LICENSE("GPL"); 599 + builtin_platform_driver(sun8i_a83t_pinctrl_driver);
+2 -7
drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
··· 10 10 * warranty of any kind, whether express or implied. 11 11 */ 12 12 13 - #include <linux/module.h> 13 + #include <linux/init.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_device.h> ··· 733 733 { .compatible = "allwinner,sun9i-a80-pinctrl", }, 734 734 {} 735 735 }; 736 - MODULE_DEVICE_TABLE(of, sun9i_a80_pinctrl_match); 737 736 738 737 static struct platform_driver sun9i_a80_pinctrl_driver = { 739 738 .probe = sun9i_a80_pinctrl_probe, ··· 741 742 .of_match_table = sun9i_a80_pinctrl_match, 742 743 }, 743 744 }; 744 - module_platform_driver(sun9i_a80_pinctrl_driver); 745 - 746 - MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>"); 747 - MODULE_DESCRIPTION("Allwinner A80 pinctrl driver"); 748 - MODULE_LICENSE("GPL"); 745 + builtin_platform_driver(sun9i_a80_pinctrl_driver);