From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: "Paul Gortmaker" <paul.gortmaker@windriver.com>,
"Philipp Zabel" <p.zabel@pengutronix.de>,
"Michal Simek" <michal.simek@xilinx.com>,
"Sören Brinkmann" <soren.brinkmann@xilinx.com>,
"Moritz Fischer" <moritz.fischer@ettus.com>
Subject: [PATCH 4/5] reset: zynq: make it explicitly non-modular
Date: Mon, 13 Jun 2016 14:03:37 -0400 [thread overview]
Message-ID: <20160613180338.29199-5-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20160613180338.29199-1-paul.gortmaker@windriver.com>
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);
--
2.8.4
next prev parent reply other threads:[~2016-06-13 18:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 18:03 [PATCH 0/5] reset: make non-modular drivers really non modular Paul Gortmaker
2016-06-13 18:03 ` [PATCH 1/5] reset: berlin: make it explicitly non-modular Paul Gortmaker
2016-06-13 18:03 ` [PATCH 2/5] reset: socfpga: " Paul Gortmaker
2016-06-13 18:03 ` [PATCH 3/5] reset: sunxi: " Paul Gortmaker
2016-06-13 18:03 ` Paul Gortmaker [this message]
2016-06-13 19:15 ` [PATCH 4/5] reset: zynq: " Moritz Fischer
2016-06-14 5:57 ` Michal Simek
2016-06-13 18:03 ` [PATCH 5/5] reset: lpc18xx: " Paul Gortmaker
2016-09-05 22:25 ` [PATCH 0/5] reset: make non-modular drivers really non modular Paul Gortmaker
2016-10-22 21:48 ` Paul Gortmaker
2016-10-24 8:56 ` Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160613180338.29199-5-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=moritz.fischer@ettus.com \
--cc=p.zabel@pengutronix.de \
--cc=soren.brinkmann@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox