Messages in this thread | | | Subject | Re: [PATCH 4/5] reset: zynq: make it explicitly non-modular | From | Michal Simek <> | Date | Tue, 14 Jun 2016 07:57:05 +0200 |
| |
On 13.6.2016 20:03, Paul Gortmaker wrote: > The Makefile/Kconfig currently controlling compilation of this code is: > > 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: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Michal Simek <michal.simek@xilinx.com> > Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com> > Cc: Moritz Fischer <moritz.fischer@ettus.com> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > drivers/reset/reset-zynq.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/reset/reset-zynq.c b/drivers/reset/reset-zynq.c > index 138f2f205662..87a4e355578f 100644 > --- a/drivers/reset/reset-zynq.c > +++ b/drivers/reset/reset-zynq.c > @@ -3,6 +3,8 @@ > * > * Xilinx Zynq Reset controller driver > * > + * Author: Moritz Fischer <moritz.fischer@ettus.com> > + * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by > * the Free Software Foundation; version 2 of the License. > @@ -15,7 +17,7 @@ > > #include <linux/err.h> > #include <linux/io.h> > -#include <linux/module.h> > +#include <linux/init.h> > #include <linux/mfd/syscon.h> > #include <linux/of.h> > #include <linux/platform_device.h> > @@ -137,8 +139,4 @@ static struct platform_driver zynq_reset_driver = { > .of_match_table = zynq_reset_dt_ids, > }, > }; > -module_platform_driver(zynq_reset_driver); > - > -MODULE_LICENSE("GPL v2"); > -MODULE_AUTHOR("Moritz Fischer <moritz.fischer@ettus.com>"); > -MODULE_DESCRIPTION("Zynq Reset Controller Driver"); > +builtin_platform_driver(zynq_reset_driver); >
Acked-by: Michal Simek <michal.simek@xilinx.com>
Thanks, Michal
| |