Commit 4c3deee9 authored Jun 06, 2016 by Paul Gortmaker Committed by Linus Walleij Jun 13, 2016

pinctrl: zynq: make it explicitly non-modular



The Kconfig currently controlling compilation of this code is:

config PINCTRL_ZYNQ
        bool "Pinctrl driver for Xilinx Zynq"

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.

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 also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann" <soren.brinkmann@xilinx.com>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent b8c2b10a

drivers/pinctrl/pinctrl-zynq.c

+1 −12

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		*/
		#include <linux/io.h>
		#include <linux/mfd/syscon.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/of.h>
		#include <linux/platform_device.h>
		#include <linux/pinctrl/pinctrl.h>
		@@ -1210,7 +1210,6 @@ static const struct of_device_id zynq_pinctrl_of_match[] = {
		{ .compatible = "xlnx,pinctrl-zynq" },
		{ }
		};
		MODULE_DEVICE_TABLE(of, zynq_pinctrl_of_match);

		static struct platform_driver zynq_pinctrl_driver = {
		.driver = {
		@@ -1225,13 +1224,3 @@ static int __init zynq_pinctrl_init(void)
		return platform_driver_register(&zynq_pinctrl_driver);
		}
		arch_initcall(zynq_pinctrl_init);

		static void __exit zynq_pinctrl_exit(void)
		{
		platform_driver_unregister(&zynq_pinctrl_driver);
		}
		module_exit(zynq_pinctrl_exit);

		MODULE_AUTHOR("Sören Brinkmann <soren.brinkmann@xilinx.com>");
		MODULE_DESCRIPTION("Xilinx Zynq pinctrl driver");
		MODULE_LICENSE("GPL");