Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1576188

[PATCH 2/4] reset: pistachio: make it explicitly non-modular

Show all headers | View raw

The Kconfig currently controlling compilation of this code is:

drivers/reset/Kconfig:config RESET_PISTACHIO
drivers/reset/Kconfig:  bool "Pistachio Reset Driver" if COMPILE_TEST

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

Lets remove the couple traces of modular infrastructure use, 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: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Damien Horsley <Damien.Horsley@imgtec.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/reset/reset-pistachio.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/reset/reset-pistachio.c b/drivers/reset/reset-pistachio.c
index bbc4c06dd33b..11d651b44e81 100644
--- a/drivers/reset/reset-pistachio.c
+++ b/drivers/reset/reset-pistachio.c
@@ -10,7 +10,7 @@
  * version 2, as published by the Free Software Foundation.
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
@@ -128,7 +128,6 @@ static const struct of_device_id pistachio_reset_dt_ids[] = {
 	 { .compatible = "img,pistachio-reset", },
 	 { /* sentinel */ },
 };
-MODULE_DEVICE_TABLE(of, pistachio_reset_dt_ids);
 
 static struct platform_driver pistachio_reset_driver = {
 	.probe	= pistachio_reset_probe,
@@ -137,8 +136,4 @@ static struct platform_driver pistachio_reset_driver = {
 		.of_match_table	= pistachio_reset_dt_ids,
 	},
 };
-module_platform_driver(pistachio_reset_driver);
-
-MODULE_AUTHOR("Damien Horsley <Damien.Horsley@imgtec.com>");
-MODULE_DESCRIPTION("Pistacho Reset Controller Driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(pistachio_reset_driver);
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] reset: de-modularize the remaining reset drivers Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-02-08 01:30 +0100
  [PATCH 4/4] reset: oxnas: make it explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-02-08 01:30 +0100
    Re: [PATCH 4/4] reset: oxnas: make it explicitly non-modular Neil Armstrong <narmstrong@baylibre.com> - 2017-02-08 10:00 +0100
  [PATCH 2/4] reset: pistachio: make it explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-02-08 01:30 +0100
  [PATCH 3/4] reset: meson: make it explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-02-08 01:30 +0100
    Re: [PATCH 3/4] reset: meson: make it explicitly non-modular Neil Armstrong <narmstrong@baylibre.com> - 2017-02-08 10:00 +0100
  Re: [PATCH 0/4] reset: de-modularize the remaining reset drivers Philipp Zabel <p.zabel@pengutronix.de> - 2017-02-08 12:30 +0100

csiph-web