diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-02-06 03:03:51 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2017-02-13 08:25:55 -0500 |
commit | 8429cba14fbb70d74b6d54816ad94545be310265 (patch) | |
tree | efd7ce8711f7a84299fceb16d642a140a1c9ca87 /drivers/pinctrl/spear | |
parent | fdbde81badf09175fc1d19ef00ae685f0246ce27 (diff) |
pinctrl: spear: 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 the exact same change, so they are handled in batch.
Changes are (1) use init.h header in place of module.h header,
(2) delete module_exit related code, (3) delete MODULE_DEVICE_TABLE,
and (4) delete MODULE_LICENCE/MODULE_AUTHOR and associated tags.
None of these drivers were using module_init() so we don't have to
worry about the init ordering getting changed with this commit.
Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
We also delete the MODULE_LICENSE etc. tags since all that information
is already contained at the top of each file in the comments.
Cc: spear-devel@list.st.com
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/spear')
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-plgpio.c | 7 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear1310.c | 12 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear1340.c | 12 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear300.c | 12 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear310.c | 12 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear320.c | 12 |
6 files changed, 1 insertions, 66 deletions
diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c index 4c9b863f8267..cf6d68c7345b 100644 --- a/drivers/pinctrl/spear/pinctrl-plgpio.c +++ b/drivers/pinctrl/spear/pinctrl-plgpio.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
14 | #include <linux/gpio/driver.h> | 14 | #include <linux/gpio/driver.h> |
15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
16 | #include <linux/module.h> | 16 | #include <linux/init.h> |
17 | #include <linux/of.h> | 17 | #include <linux/of.h> |
18 | #include <linux/of_platform.h> | 18 | #include <linux/of_platform.h> |
19 | #include <linux/pinctrl/consumer.h> | 19 | #include <linux/pinctrl/consumer.h> |
@@ -705,7 +705,6 @@ static const struct of_device_id plgpio_of_match[] = { | |||
705 | { .compatible = "st,spear-plgpio" }, | 705 | { .compatible = "st,spear-plgpio" }, |
706 | {} | 706 | {} |
707 | }; | 707 | }; |
708 | MODULE_DEVICE_TABLE(of, plgpio_of_match); | ||
709 | 708 | ||
710 | static struct platform_driver plgpio_driver = { | 709 | static struct platform_driver plgpio_driver = { |
711 | .probe = plgpio_probe, | 710 | .probe = plgpio_probe, |
@@ -721,7 +720,3 @@ static int __init plgpio_init(void) | |||
721 | return platform_driver_register(&plgpio_driver); | 720 | return platform_driver_register(&plgpio_driver); |
722 | } | 721 | } |
723 | subsys_initcall(plgpio_init); | 722 | subsys_initcall(plgpio_init); |
724 | |||
725 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>"); | ||
726 | MODULE_DESCRIPTION("STMicroelectronics SPEAr PLGPIO driver"); | ||
727 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/pinctrl/spear/pinctrl-spear1310.c b/drivers/pinctrl/spear/pinctrl-spear1310.c index 18210681c737..0180eb544f02 100644 --- a/drivers/pinctrl/spear/pinctrl-spear1310.c +++ b/drivers/pinctrl/spear/pinctrl-spear1310.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/module.h> | ||
15 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
16 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
17 | #include "pinctrl-spear.h" | 16 | #include "pinctrl-spear.h" |
@@ -2717,14 +2716,3 @@ static int __init spear1310_pinctrl_init(void) | |||
2717 | return platform_driver_register(&spear1310_pinctrl_driver); | 2716 | return platform_driver_register(&spear1310_pinctrl_driver); |
2718 | } | 2717 | } |
2719 | arch_initcall(spear1310_pinctrl_init); | 2718 | arch_initcall(spear1310_pinctrl_init); |
2720 | |||
2721 | static void __exit spear1310_pinctrl_exit(void) | ||
2722 | { | ||
2723 | platform_driver_unregister(&spear1310_pinctrl_driver); | ||
2724 | } | ||
2725 | module_exit(spear1310_pinctrl_exit); | ||
2726 | |||
2727 | MODULE_AUTHOR("Viresh Kumar <vireshk@kernel.org>"); | ||
2728 | MODULE_DESCRIPTION("ST Microelectronics SPEAr1310 pinctrl driver"); | ||
2729 | MODULE_LICENSE("GPL v2"); | ||
2730 | MODULE_DEVICE_TABLE(of, spear1310_pinctrl_of_match); | ||
diff --git a/drivers/pinctrl/spear/pinctrl-spear1340.c b/drivers/pinctrl/spear/pinctrl-spear1340.c index c01fb23ee636..0ca961219b3b 100644 --- a/drivers/pinctrl/spear/pinctrl-spear1340.c +++ b/drivers/pinctrl/spear/pinctrl-spear1340.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/module.h> | ||
15 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
16 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
17 | #include "pinctrl-spear.h" | 16 | #include "pinctrl-spear.h" |
@@ -2033,14 +2032,3 @@ static int __init spear1340_pinctrl_init(void) | |||
2033 | return platform_driver_register(&spear1340_pinctrl_driver); | 2032 | return platform_driver_register(&spear1340_pinctrl_driver); |
2034 | } | 2033 | } |
2035 | arch_initcall(spear1340_pinctrl_init); | 2034 | arch_initcall(spear1340_pinctrl_init); |
2036 | |||
2037 | static void __exit spear1340_pinctrl_exit(void) | ||
2038 | { | ||
2039 | platform_driver_unregister(&spear1340_pinctrl_driver); | ||
2040 | } | ||
2041 | module_exit(spear1340_pinctrl_exit); | ||
2042 | |||
2043 | MODULE_AUTHOR("Viresh Kumar <vireshk@kernel.org>"); | ||
2044 | MODULE_DESCRIPTION("ST Microelectronics SPEAr1340 pinctrl driver"); | ||
2045 | MODULE_LICENSE("GPL v2"); | ||
2046 | MODULE_DEVICE_TABLE(of, spear1340_pinctrl_of_match); | ||
diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c index 111148daa3f1..e39913a18139 100644 --- a/drivers/pinctrl/spear/pinctrl-spear300.c +++ b/drivers/pinctrl/spear/pinctrl-spear300.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/module.h> | ||
15 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
16 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
17 | #include "pinctrl-spear3xx.h" | 16 | #include "pinctrl-spear3xx.h" |
@@ -690,14 +689,3 @@ static int __init spear300_pinctrl_init(void) | |||
690 | return platform_driver_register(&spear300_pinctrl_driver); | 689 | return platform_driver_register(&spear300_pinctrl_driver); |
691 | } | 690 | } |
692 | arch_initcall(spear300_pinctrl_init); | 691 | arch_initcall(spear300_pinctrl_init); |
693 | |||
694 | static void __exit spear300_pinctrl_exit(void) | ||
695 | { | ||
696 | platform_driver_unregister(&spear300_pinctrl_driver); | ||
697 | } | ||
698 | module_exit(spear300_pinctrl_exit); | ||
699 | |||
700 | MODULE_AUTHOR("Viresh Kumar <vireshk@kernel.org>"); | ||
701 | MODULE_DESCRIPTION("ST Microelectronics SPEAr300 pinctrl driver"); | ||
702 | MODULE_LICENSE("GPL v2"); | ||
703 | MODULE_DEVICE_TABLE(of, spear300_pinctrl_of_match); | ||
diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c index a7b000062985..393b2b97d527 100644 --- a/drivers/pinctrl/spear/pinctrl-spear310.c +++ b/drivers/pinctrl/spear/pinctrl-spear310.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/module.h> | ||
15 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
16 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
17 | #include "pinctrl-spear3xx.h" | 16 | #include "pinctrl-spear3xx.h" |
@@ -413,14 +412,3 @@ static int __init spear310_pinctrl_init(void) | |||
413 | return platform_driver_register(&spear310_pinctrl_driver); | 412 | return platform_driver_register(&spear310_pinctrl_driver); |
414 | } | 413 | } |
415 | arch_initcall(spear310_pinctrl_init); | 414 | arch_initcall(spear310_pinctrl_init); |
416 | |||
417 | static void __exit spear310_pinctrl_exit(void) | ||
418 | { | ||
419 | platform_driver_unregister(&spear310_pinctrl_driver); | ||
420 | } | ||
421 | module_exit(spear310_pinctrl_exit); | ||
422 | |||
423 | MODULE_AUTHOR("Viresh Kumar <vireshk@kernel.org>"); | ||
424 | MODULE_DESCRIPTION("ST Microelectronics SPEAr310 pinctrl driver"); | ||
425 | MODULE_LICENSE("GPL v2"); | ||
426 | MODULE_DEVICE_TABLE(of, spear310_pinctrl_of_match); | ||
diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c index e2b3817701dc..99c10fc3d9b5 100644 --- a/drivers/pinctrl/spear/pinctrl-spear320.c +++ b/drivers/pinctrl/spear/pinctrl-spear320.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/module.h> | ||
15 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
16 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
17 | #include "pinctrl-spear3xx.h" | 16 | #include "pinctrl-spear3xx.h" |
@@ -3454,14 +3453,3 @@ static int __init spear320_pinctrl_init(void) | |||
3454 | return platform_driver_register(&spear320_pinctrl_driver); | 3453 | return platform_driver_register(&spear320_pinctrl_driver); |
3455 | } | 3454 | } |
3456 | arch_initcall(spear320_pinctrl_init); | 3455 | arch_initcall(spear320_pinctrl_init); |
3457 | |||
3458 | static void __exit spear320_pinctrl_exit(void) | ||
3459 | { | ||
3460 | platform_driver_unregister(&spear320_pinctrl_driver); | ||
3461 | } | ||
3462 | module_exit(spear320_pinctrl_exit); | ||
3463 | |||
3464 | MODULE_AUTHOR("Viresh Kumar <vireshk@kernel.org>"); | ||
3465 | MODULE_DESCRIPTION("ST Microelectronics SPEAr320 pinctrl driver"); | ||
3466 | MODULE_LICENSE("GPL v2"); | ||
3467 | MODULE_DEVICE_TABLE(of, spear320_pinctrl_of_match); | ||