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

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>

authored by

Paul Gortmaker and committed by
Linus Walleij
fdbde81b cff1f7a9

+9 -65
+1 -7
drivers/pinctrl/mvebu/pinctrl-armada-370.c
··· 14 14 #include <linux/err.h> 15 15 #include <linux/init.h> 16 16 #include <linux/io.h> 17 - #include <linux/module.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/clk.h> 20 19 #include <linux/of.h> ··· 405 406 }, 406 407 .probe = armada_370_pinctrl_probe, 407 408 }; 408 - 409 - module_platform_driver(armada_370_pinctrl_driver); 410 - 411 - MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); 412 - MODULE_DESCRIPTION("Marvell Armada 370 pinctrl driver"); 413 - MODULE_LICENSE("GPL v2"); 409 + builtin_platform_driver(armada_370_pinctrl_driver);
+1 -7
drivers/pinctrl/mvebu/pinctrl-armada-375.c
··· 14 14 #include <linux/err.h> 15 15 #include <linux/init.h> 16 16 #include <linux/io.h> 17 - #include <linux/module.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/clk.h> 20 19 #include <linux/of.h> ··· 423 424 }, 424 425 .probe = armada_375_pinctrl_probe, 425 426 }; 426 - 427 - module_platform_driver(armada_375_pinctrl_driver); 428 - 429 - MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); 430 - MODULE_DESCRIPTION("Marvell Armada 375 pinctrl driver"); 431 - MODULE_LICENSE("GPL v2"); 427 + builtin_platform_driver(armada_375_pinctrl_driver);
+1 -7
drivers/pinctrl/mvebu/pinctrl-armada-38x.c
··· 14 14 #include <linux/err.h> 15 15 #include <linux/init.h> 16 16 #include <linux/io.h> 17 - #include <linux/module.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/of.h> 20 19 #include <linux/of_device.h> ··· 434 435 }, 435 436 .probe = armada_38x_pinctrl_probe, 436 437 }; 437 - 438 - module_platform_driver(armada_38x_pinctrl_driver); 439 - 440 - MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); 441 - MODULE_DESCRIPTION("Marvell Armada 38x pinctrl driver"); 442 - MODULE_LICENSE("GPL v2"); 438 + builtin_platform_driver(armada_38x_pinctrl_driver);
+1 -7
drivers/pinctrl/mvebu/pinctrl-armada-39x.c
··· 14 14 #include <linux/err.h> 15 15 #include <linux/init.h> 16 16 #include <linux/io.h> 17 - #include <linux/module.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/of.h> 20 19 #include <linux/of_device.h> ··· 416 417 }, 417 418 .probe = armada_39x_pinctrl_probe, 418 419 }; 419 - 420 - module_platform_driver(armada_39x_pinctrl_driver); 421 - 422 - MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); 423 - MODULE_DESCRIPTION("Marvell Armada 39x pinctrl driver"); 424 - MODULE_LICENSE("GPL v2"); 420 + builtin_platform_driver(armada_39x_pinctrl_driver);
+1 -7
drivers/pinctrl/mvebu/pinctrl-armada-xp.c
··· 20 20 #include <linux/err.h> 21 21 #include <linux/init.h> 22 22 #include <linux/io.h> 23 - #include <linux/module.h> 24 23 #include <linux/platform_device.h> 25 24 #include <linux/clk.h> 26 25 #include <linux/of.h> ··· 649 650 .suspend = armada_xp_pinctrl_suspend, 650 651 .resume = armada_xp_pinctrl_resume, 651 652 }; 652 - 653 - module_platform_driver(armada_xp_pinctrl_driver); 654 - 655 - MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); 656 - MODULE_DESCRIPTION("Marvell Armada XP pinctrl driver"); 657 - MODULE_LICENSE("GPL v2"); 653 + builtin_platform_driver(armada_xp_pinctrl_driver);
+2 -15
drivers/pinctrl/mvebu/pinctrl-dove.c
··· 12 12 #include <linux/err.h> 13 13 #include <linux/init.h> 14 14 #include <linux/io.h> 15 - #include <linux/module.h> 16 15 #include <linux/bitops.h> 17 16 #include <linux/platform_device.h> 18 17 #include <linux/clk.h> ··· 853 854 return mvebu_pinctrl_probe(pdev); 854 855 } 855 856 856 - static int dove_pinctrl_remove(struct platform_device *pdev) 857 - { 858 - if (!IS_ERR(clk)) 859 - clk_disable_unprepare(clk); 860 - return 0; 861 - } 862 - 863 857 static struct platform_driver dove_pinctrl_driver = { 864 858 .driver = { 865 859 .name = "dove-pinctrl", 860 + .suppress_bind_attrs = true, 866 861 .of_match_table = dove_pinctrl_of_match, 867 862 }, 868 863 .probe = dove_pinctrl_probe, 869 - .remove = dove_pinctrl_remove, 870 864 }; 871 - 872 - module_platform_driver(dove_pinctrl_driver); 873 - 874 - MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>"); 875 - MODULE_DESCRIPTION("Marvell Dove pinctrl driver"); 876 - MODULE_LICENSE("GPL v2"); 865 + builtin_platform_driver(dove_pinctrl_driver);
+1 -7
drivers/pinctrl/mvebu/pinctrl-kirkwood.c
··· 12 12 #include <linux/err.h> 13 13 #include <linux/init.h> 14 14 #include <linux/io.h> 15 - #include <linux/module.h> 16 15 #include <linux/platform_device.h> 17 16 #include <linux/clk.h> 18 17 #include <linux/of.h> ··· 471 472 }, 472 473 .probe = kirkwood_pinctrl_probe, 473 474 }; 474 - 475 - module_platform_driver(kirkwood_pinctrl_driver); 476 - 477 - MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>"); 478 - MODULE_DESCRIPTION("Marvell Kirkwood pinctrl driver"); 479 - MODULE_LICENSE("GPL v2"); 475 + builtin_platform_driver(kirkwood_pinctrl_driver);
-1
drivers/pinctrl/mvebu/pinctrl-mvebu.c
··· 11 11 */ 12 12 13 13 #include <linux/platform_device.h> 14 - #include <linux/module.h> 15 14 #include <linux/slab.h> 16 15 #include <linux/io.h> 17 16 #include <linux/of.h>
+1 -7
drivers/pinctrl/mvebu/pinctrl-orion.c
··· 20 20 #include <linux/err.h> 21 21 #include <linux/init.h> 22 22 #include <linux/io.h> 23 - #include <linux/module.h> 24 23 #include <linux/platform_device.h> 25 24 #include <linux/clk.h> 26 25 #include <linux/of.h> ··· 248 249 }, 249 250 .probe = orion_pinctrl_probe, 250 251 }; 251 - 252 - module_platform_driver(orion_pinctrl_driver); 253 - 254 - MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); 255 - MODULE_DESCRIPTION("Marvell Orion pinctrl driver"); 256 - MODULE_LICENSE("GPL v2"); 252 + builtin_platform_driver(orion_pinctrl_driver);