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

reset: zynq: make it explicitly non-modular

The Makefile/Kconfig currently controlling compilation of this code is:

drivers/reset/Kconfig:config RESET_ZYNQ
drivers/reset/Kconfig: bool "ZYNQ Reset Driver" if COMPILE_TEST
drivers/reset/Kconfig: default ARCH_ZYNQ

or

drivers/reset/Makefile:obj-$(CONFIG_ARCH_ZYNQ) += reset-zynq.o
arch/arm/mach-zynq/Kconfig:config ARCH_ZYNQ
arch/arm/mach-zynq/Kconfig: bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7

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

Lets remove the few remaining traces of modular macro usage, 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.

We also delete the MODULE_LICENSE tag etc. since all that information
was (or is now) contained at the top of the file in the comments.

Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

authored by

Paul Gortmaker and committed by
Philipp Zabel
fadb03cd c4742ed3

+4 -6
+4 -6
drivers/reset/reset-zynq.c
··· 3 3 * 4 4 * Xilinx Zynq Reset controller driver 5 5 * 6 + * Author: Moritz Fischer <moritz.fischer@ettus.com> 7 + * 6 8 * This program is free software; you can redistribute it and/or modify 7 9 * it under the terms of the GNU General Public License as published by 8 10 * the Free Software Foundation; version 2 of the License. ··· 17 15 18 16 #include <linux/err.h> 19 17 #include <linux/io.h> 20 - #include <linux/module.h> 18 + #include <linux/init.h> 21 19 #include <linux/mfd/syscon.h> 22 20 #include <linux/of.h> 23 21 #include <linux/platform_device.h> ··· 139 137 .of_match_table = zynq_reset_dt_ids, 140 138 }, 141 139 }; 142 - module_platform_driver(zynq_reset_driver); 143 - 144 - MODULE_LICENSE("GPL v2"); 145 - MODULE_AUTHOR("Moritz Fischer <moritz.fischer@ettus.com>"); 146 - MODULE_DESCRIPTION("Zynq Reset Controller Driver"); 140 + builtin_platform_driver(zynq_reset_driver);