diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-02-06 03:03:50 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2017-02-13 08:25:49 -0500 |
commit | fdbde81badf09175fc1d19ef00ae685f0246ce27 (patch) | |
tree | 6be2b05741cbb78d111508f6c2f4a6f671c0a8e1 | |
parent | cff1f7a9a27d2562bc221d0506d30b459505649c (diff) |
pinctrl: mvebu: 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 builtin_platform_driver, (2) dont use module.h
(3) delete module_exit related code, (4) delete MODULE_DEVICE_TABLE,
and (5) delete MODULE_LICENCE/MODULE_AUTHOR and associated tags.
For the dove driver we explicitly disallow a driver unbind, since
that doesn't have a sensible use case anyway, and it allows us to
drop the ".remove" code for non-modular drivers.
Since module_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.
We deleted the MODULE_LICENSE etc. tags since all that information
is already contained at the top of the file in the comments.
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-370.c | 8 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-375.c | 8 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 8 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 8 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 8 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-dove.c | 17 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 8 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-mvebu.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-orion.c | 8 |
9 files changed, 9 insertions, 65 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c index c2de4f8ee488..9feba9a5ccb7 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | #include <linux/module.h> | ||
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
19 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
20 | #include <linux/of.h> | 19 | #include <linux/of.h> |
@@ -406,9 +405,4 @@ static struct platform_driver armada_370_pinctrl_driver = { | |||
406 | }, | 405 | }, |
407 | .probe = armada_370_pinctrl_probe, | 406 | .probe = armada_370_pinctrl_probe, |
408 | }; | 407 | }; |
409 | 408 | builtin_platform_driver(armada_370_pinctrl_driver); | |
410 | module_platform_driver(armada_370_pinctrl_driver); | ||
411 | |||
412 | MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); | ||
413 | MODULE_DESCRIPTION("Marvell Armada 370 pinctrl driver"); | ||
414 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-375.c b/drivers/pinctrl/mvebu/pinctrl-armada-375.c index 30cbf23b0b03..b7de8abccd48 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-375.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-375.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | #include <linux/module.h> | ||
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
19 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
20 | #include <linux/of.h> | 19 | #include <linux/of.h> |
@@ -424,9 +423,4 @@ static struct platform_driver armada_375_pinctrl_driver = { | |||
424 | }, | 423 | }, |
425 | .probe = armada_375_pinctrl_probe, | 424 | .probe = armada_375_pinctrl_probe, |
426 | }; | 425 | }; |
427 | 426 | builtin_platform_driver(armada_375_pinctrl_driver); | |
428 | module_platform_driver(armada_375_pinctrl_driver); | ||
429 | |||
430 | MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); | ||
431 | MODULE_DESCRIPTION("Marvell Armada 375 pinctrl driver"); | ||
432 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c index e66ed239522e..de2e1538a26f 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | #include <linux/module.h> | ||
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
19 | #include <linux/of.h> | 18 | #include <linux/of.h> |
20 | #include <linux/of_device.h> | 19 | #include <linux/of_device.h> |
@@ -435,9 +434,4 @@ static struct platform_driver armada_38x_pinctrl_driver = { | |||
435 | }, | 434 | }, |
436 | .probe = armada_38x_pinctrl_probe, | 435 | .probe = armada_38x_pinctrl_probe, |
437 | }; | 436 | }; |
438 | 437 | builtin_platform_driver(armada_38x_pinctrl_driver); | |
439 | module_platform_driver(armada_38x_pinctrl_driver); | ||
440 | |||
441 | MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); | ||
442 | MODULE_DESCRIPTION("Marvell Armada 38x pinctrl driver"); | ||
443 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c index 697c8774a4da..627f57c88372 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | #include <linux/module.h> | ||
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
19 | #include <linux/of.h> | 18 | #include <linux/of.h> |
20 | #include <linux/of_device.h> | 19 | #include <linux/of_device.h> |
@@ -417,9 +416,4 @@ static struct platform_driver armada_39x_pinctrl_driver = { | |||
417 | }, | 416 | }, |
418 | .probe = armada_39x_pinctrl_probe, | 417 | .probe = armada_39x_pinctrl_probe, |
419 | }; | 418 | }; |
420 | 419 | builtin_platform_driver(armada_39x_pinctrl_driver); | |
421 | module_platform_driver(armada_39x_pinctrl_driver); | ||
422 | |||
423 | MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); | ||
424 | MODULE_DESCRIPTION("Marvell Armada 39x pinctrl driver"); | ||
425 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c index 61cbc138703e..b854f1ee5de5 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/module.h> | ||
24 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
25 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
@@ -650,9 +649,4 @@ static struct platform_driver armada_xp_pinctrl_driver = { | |||
650 | .suspend = armada_xp_pinctrl_suspend, | 649 | .suspend = armada_xp_pinctrl_suspend, |
651 | .resume = armada_xp_pinctrl_resume, | 650 | .resume = armada_xp_pinctrl_resume, |
652 | }; | 651 | }; |
653 | 652 | builtin_platform_driver(armada_xp_pinctrl_driver); | |
654 | module_platform_driver(armada_xp_pinctrl_driver); | ||
655 | |||
656 | MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); | ||
657 | MODULE_DESCRIPTION("Marvell Armada XP pinctrl driver"); | ||
658 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c index 89ae93c49f2f..8472f61f2bbe 100644 --- a/drivers/pinctrl/mvebu/pinctrl-dove.c +++ b/drivers/pinctrl/mvebu/pinctrl-dove.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
15 | #include <linux/module.h> | ||
16 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
18 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
@@ -854,24 +853,12 @@ static int dove_pinctrl_probe(struct platform_device *pdev) | |||
854 | return mvebu_pinctrl_probe(pdev); | 853 | return mvebu_pinctrl_probe(pdev); |
855 | } | 854 | } |
856 | 855 | ||
857 | static int dove_pinctrl_remove(struct platform_device *pdev) | ||
858 | { | ||
859 | if (!IS_ERR(clk)) | ||
860 | clk_disable_unprepare(clk); | ||
861 | return 0; | ||
862 | } | ||
863 | |||
864 | static struct platform_driver dove_pinctrl_driver = { | 856 | static struct platform_driver dove_pinctrl_driver = { |
865 | .driver = { | 857 | .driver = { |
866 | .name = "dove-pinctrl", | 858 | .name = "dove-pinctrl", |
859 | .suppress_bind_attrs = true, | ||
867 | .of_match_table = dove_pinctrl_of_match, | 860 | .of_match_table = dove_pinctrl_of_match, |
868 | }, | 861 | }, |
869 | .probe = dove_pinctrl_probe, | 862 | .probe = dove_pinctrl_probe, |
870 | .remove = dove_pinctrl_remove, | ||
871 | }; | 863 | }; |
872 | 864 | builtin_platform_driver(dove_pinctrl_driver); | |
873 | module_platform_driver(dove_pinctrl_driver); | ||
874 | |||
875 | MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>"); | ||
876 | MODULE_DESCRIPTION("Marvell Dove pinctrl driver"); | ||
877 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c index be12b6d569a0..5995a19abde5 100644 --- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c +++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
15 | #include <linux/module.h> | ||
16 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
17 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
18 | #include <linux/of.h> | 17 | #include <linux/of.h> |
@@ -472,9 +471,4 @@ static struct platform_driver kirkwood_pinctrl_driver = { | |||
472 | }, | 471 | }, |
473 | .probe = kirkwood_pinctrl_probe, | 472 | .probe = kirkwood_pinctrl_probe, |
474 | }; | 473 | }; |
475 | 474 | builtin_platform_driver(kirkwood_pinctrl_driver); | |
476 | module_platform_driver(kirkwood_pinctrl_driver); | ||
477 | |||
478 | MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>"); | ||
479 | MODULE_DESCRIPTION("Marvell Kirkwood pinctrl driver"); | ||
480 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c index 1bdfe770eb5c..e4dda12d371a 100644 --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/module.h> | ||
15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
16 | #include <linux/io.h> | 15 | #include <linux/io.h> |
17 | #include <linux/of.h> | 16 | #include <linux/of.h> |
diff --git a/drivers/pinctrl/mvebu/pinctrl-orion.c b/drivers/pinctrl/mvebu/pinctrl-orion.c index c2e0c16cf9b3..69cb4d9f0114 100644 --- a/drivers/pinctrl/mvebu/pinctrl-orion.c +++ b/drivers/pinctrl/mvebu/pinctrl-orion.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/module.h> | ||
24 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
25 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
@@ -249,9 +248,4 @@ static struct platform_driver orion_pinctrl_driver = { | |||
249 | }, | 248 | }, |
250 | .probe = orion_pinctrl_probe, | 249 | .probe = orion_pinctrl_probe, |
251 | }; | 250 | }; |
252 | 251 | builtin_platform_driver(orion_pinctrl_driver); | |
253 | module_platform_driver(orion_pinctrl_driver); | ||
254 | |||
255 | MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); | ||
256 | MODULE_DESCRIPTION("Marvell Orion pinctrl driver"); | ||
257 | MODULE_LICENSE("GPL v2"); | ||