| Message ID | 20181010172300.317643-3-lkundrak@v3.sk (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for OLPC XO 1.75 Embedded Controller | expand |
On Wed, Oct 10, 2018 at 8:23 PM Lubomir Rintel <lkundrak@v3.sk> wrote: > > It doesn't make sense to always have this built-in, e.g. on ARM > multiplatform kernels. A better way to address the problem the original > commit aimed to solve is to fix Kconfig. > > This reverts commit f48d1496b8537d75776478c6942dd87f34d7f270. > This change doesn't make any sense when put in _this_ order in the series. First, you need to show the CONFIG_OLPC as tristate, which doesn't (Am I missing something?). > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> > --- > drivers/platform/olpc/olpc-ec.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c > index 374a8028fec7..f99b183d5296 100644 > --- a/drivers/platform/olpc/olpc-ec.c > +++ b/drivers/platform/olpc/olpc-ec.c > @@ -1,8 +1,6 @@ > /* > * 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. > @@ -14,7 +12,7 @@ > #include <linux/platform_device.h> > #include <linux/slab.h> > #include <linux/workqueue.h> > -#include <linux/init.h> > +#include <linux/module.h> > #include <linux/list.h> > #include <linux/olpc-ec.h> > #include <asm/olpc.h> > @@ -328,4 +326,8 @@ 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.19.0 >
On Wed 2018-10-10 19:22:47, Lubomir Rintel wrote: > It doesn't make sense to always have this built-in, e.g. on ARM > multiplatform kernels. A better way to address the problem the original > commit aimed to solve is to fix Kconfig. > > This reverts commit f48d1496b8537d75776478c6942dd87f34d7f270. This looks ok, but I don't see the Kconfig fix in the series. Is it needed? Pavel
On Fri, 2018-11-02 at 23:16 +0100, Pavel Machek wrote: > On Wed 2018-10-10 19:22:47, Lubomir Rintel wrote: > > It doesn't make sense to always have this built-in, e.g. on ARM > > multiplatform kernels. A better way to address the problem the > > original > > commit aimed to solve is to fix Kconfig. > > > > This reverts commit f48d1496b8537d75776478c6942dd87f34d7f270. > > This looks ok, but I don't see the Kconfig fix in the series. Is it > needed? It's flipped to a tristate in "Platform: OLPC: Move OLPC config symbol out of x86 tree" and mentioned in the commit message. Perhaps I could made that clear by separating the change into a separate patch. I'm keeping it as it is in next version of the patch set, but I'm going to improve this one's commit message and sort the patches closer together. > Pavel Lubo
diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c index 374a8028fec7..f99b183d5296 100644 --- a/drivers/platform/olpc/olpc-ec.c +++ b/drivers/platform/olpc/olpc-ec.c @@ -1,8 +1,6 @@ /* * 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. @@ -14,7 +12,7 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <linux/init.h> +#include <linux/module.h> #include <linux/list.h> #include <linux/olpc-ec.h> #include <asm/olpc.h> @@ -328,4 +326,8 @@ 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");
It doesn't make sense to always have this built-in, e.g. on ARM multiplatform kernels. A better way to address the problem the original commit aimed to solve is to fix Kconfig. This reverts commit f48d1496b8537d75776478c6942dd87f34d7f270. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> --- drivers/platform/olpc/olpc-ec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)