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

Groups > linux.kernel > #1421084 > unrolled thread

[PATCH 4/5] reset: zynq: make it explicitly non-modular

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 4/5] reset: zynq: make it explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-06-13 20:10 +0200
    Re: [PATCH 4/5] reset: zynq: make it explicitly non-modular Moritz Fischer <moritz.fischer@ettus.com> - 2016-06-13 21:20 +0200
    Re: [PATCH 4/5] reset: zynq: make it explicitly non-modular Michal Simek <michal.simek@xilinx.com> - 2016-06-14 08:20 +0200

#1421084 — [PATCH 4/5] reset: zynq: make it explicitly non-modular

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

[toc] | [next] | [standalone]

#1421215

Hi Paul,

On Mon, Jun 13, 2016 at 11:03 AM, Paul Gortmaker
<paul.gortmaker@windriver.com> 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>

Acked-By: Moritz Fischer <moritz.fischer@ettus.com>

Thanks,

Moritz

[toc] | [prev] | [next] | [standalone]

#1421603

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web