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

Groups > linux.kernel > #1463220 > unrolled thread

[PATCH] platform: olpc: make ec explicitly non-modular

Back to article view | Back to linux.kernel

Contents

  [PATCH] platform: olpc: make ec explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-08-16 00:30 +0200
    Re: [PATCH] platform: olpc: make ec explicitly non-modular Andres Salomon <dilinger@queued.net> - 2016-08-16 03:10 +0200
      Re: [PATCH] platform: olpc: make ec explicitly non-modular Darren Hart <dvhart@infradead.org> - 2016-08-17 02:10 +0200

#1463220 — [PATCH] platform: olpc: make ec explicitly non-modular

The Kconfig entry controlling compilation of this code is:

arch/x86/Kconfig:config OLPC
arch/x86/Kconfig:       bool "One Laptop Per Child support"

...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.

We 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: Darren Hart <dvhart@infradead.org>
Cc: Andres Salomon <dilinger@queued.net>
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/platform/olpc/olpc-ec.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index f99b183d5296..374a8028fec7 100644
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -1,6 +1,8 @@
 /*
  * Generic driver for the OLPC Embedded Controller.
  *
+ * Author: Andres Salomon <dilinger@queued.net>
+ *
  * Copyright (C) 2011-2012 One Laptop per Child Foundation.
  *
  * Licensed under the GPL v2 or later.
@@ -12,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/list.h>
 #include <linux/olpc-ec.h>
 #include <asm/olpc.h>
@@ -326,8 +328,4 @@ static int __init olpc_ec_init_module(void)
 {
 	return platform_driver_register(&olpc_ec_plat_driver);
 }
-
 arch_initcall(olpc_ec_init_module);
-
-MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
-MODULE_LICENSE("GPL");
-- 
2.8.4

[toc] | [next] | [standalone]

#1463316

Fine by me.

Acked-by: Andres Salomon <dilinger@queued.net>

On Mon, 15
Aug 2016 18:25:17 -0400 Paul Gortmaker <paul.gortmaker@windriver.com>
wrote:

> The Kconfig entry controlling compilation of this code is:
> 
> arch/x86/Kconfig:config OLPC
> arch/x86/Kconfig:       bool "One Laptop Per Child support"
> 
> ...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.
> 
> We 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: Darren Hart <dvhart@infradead.org>
> Cc: Andres Salomon <dilinger@queued.net>
> Cc: platform-driver-x86@vger.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>  drivers/platform/olpc/olpc-ec.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/platform/olpc/olpc-ec.c
> b/drivers/platform/olpc/olpc-ec.c index f99b183d5296..374a8028fec7
> 100644 --- a/drivers/platform/olpc/olpc-ec.c
> +++ b/drivers/platform/olpc/olpc-ec.c
> @@ -1,6 +1,8 @@
>  /*
>   * Generic driver for the OLPC Embedded Controller.
>   *
> + * Author: Andres Salomon <dilinger@queued.net>
> + *
>   * Copyright (C) 2011-2012 One Laptop per Child Foundation.
>   *
>   * Licensed under the GPL v2 or later.
> @@ -12,7 +14,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
>  #include <linux/workqueue.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
>  #include <linux/list.h>
>  #include <linux/olpc-ec.h>
>  #include <asm/olpc.h>
> @@ -326,8 +328,4 @@ static int __init olpc_ec_init_module(void)
>  {
>  	return platform_driver_register(&olpc_ec_plat_driver);
>  }
> -
>  arch_initcall(olpc_ec_init_module);
> -
> -MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
> -MODULE_LICENSE("GPL");

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

#1464239

On Mon, Aug 15, 2016 at 06:01:20PM -0700, Andres Salomon wrote:
> Fine by me.
> 
> Acked-by: Andres Salomon <dilinger@queued.net>
> 
> On Mon, 15
> Aug 2016 18:25:17 -0400 Paul Gortmaker <paul.gortmaker@windriver.com>
> wrote:
> 
> > The Kconfig entry controlling compilation of this code is:
> > 
> > arch/x86/Kconfig:config OLPC
> > arch/x86/Kconfig:       bool "One Laptop Per Child support"
> > 
> > ...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.
> > 
> > We 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: Darren Hart <dvhart@infradead.org>
> > Cc: Andres Salomon <dilinger@queued.net>
> > Cc: platform-driver-x86@vger.kernel.org
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Queued to fixes for 4.8. Thanks.

-- 
Darren Hart
Intel Open Source Technology Center

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web