| Message ID | 1320580651-4860-1-git-send-email-jonas.gorski@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4e549d6d4a32d1a610ad081841d575f64087744a |
| Headers | show |
[[PATCH] MTD: MAPS: bcm963xx-flash.c: explicitly include module.h] On 06/11/2011 (Sun 12:57) Jonas Gorski wrote: > module.h was previously implicitly included through mtd/mtd.h. > > Fixes the following build failure after the module.h cleanup: > > CC drivers/mtd/maps/bcm963xx-flash.o > drivers/mtd/maps/bcm963xx-flash.c: In function 'bcm963xx_probe': > drivers/mtd/maps/bcm963xx-flash.c:208:29: error: 'THIS_MODULE' undeclared (first use in this function) > drivers/mtd/maps/bcm963xx-flash.c:208:29: note: each undeclared identifier is reported only once for each function it appears in > drivers/mtd/maps/bcm963xx-flash.c: At top level: > drivers/mtd/maps/bcm963xx-flash.c:255:12: error: 'THIS_MODULE' undeclared here (not in a function) > drivers/mtd/maps/bcm963xx-flash.c:272:16: error: expected declaration specifiers or '...' before string constant > drivers/mtd/maps/bcm963xx-flash.c:272:1: warning: data definition has no type or storage class > drivers/mtd/maps/bcm963xx-flash.c:272:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE' > drivers/mtd/maps/bcm963xx-flash.c:272:16: warning: function declaration isn't a prototype > drivers/mtd/maps/bcm963xx-flash.c:273:20: error: expected declaration specifiers or '...' before string constant > drivers/mtd/maps/bcm963xx-flash.c:273:1: warning: data definition has no type or storage class > drivers/mtd/maps/bcm963xx-flash.c:273:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION' > drivers/mtd/maps/bcm963xx-flash.c:273:20: warning: function declaration isn't a prototype > drivers/mtd/maps/bcm963xx-flash.c:274:15: error: expected declaration specifiers or '...' before string constant > drivers/mtd/maps/bcm963xx-flash.c:274:1: warning: data definition has no type or storage class > drivers/mtd/maps/bcm963xx-flash.c:274:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' > drivers/mtd/maps/bcm963xx-flash.c:274:15: warning: function declaration isn't a prototype > drivers/mtd/maps/bcm963xx-flash.c:275:15: error: expected declaration specifiers or '...' before string constant > drivers/mtd/maps/bcm963xx-flash.c:275:1: warning: data definition has no type or storage class > drivers/mtd/maps/bcm963xx-flash.c:275:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' > drivers/mtd/maps/bcm963xx-flash.c:275:15: warning: function declaration isn't a prototype > drivers/mtd/maps/bcm963xx-flash.c:276:15: error: expected declaration specifiers or '...' before string constant > drivers/mtd/maps/bcm963xx-flash.c:276:1: warning: data definition has no type or storage class > drivers/mtd/maps/bcm963xx-flash.c:276:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' > drivers/mtd/maps/bcm963xx-flash.c:276:15: warning: function declaration isn't a prototype > make[7]: *** [drivers/mtd/maps/bcm963xx-flash.o] Error 1 > > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> > --- > > This patch is based on next-20111104 and probably should go through Paul's module.h cleanup tree. I can put it in the module.h tree, but for files that are using module.h stuff, they can simply add it via the normal maintainer flow, since files that use modular stuff should include module.h regardless and there are no dependencies on the module.h content for things like this. Thanks, Paul. > > drivers/mtd/maps/bcm963xx-flash.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c > index 608967f..736ca10 100644 > --- a/drivers/mtd/maps/bcm963xx-flash.c > +++ b/drivers/mtd/maps/bcm963xx-flash.c > @@ -21,6 +21,7 @@ > #include <linux/init.h> > #include <linux/kernel.h> > #include <linux/slab.h> > +#include <linux/module.h> > #include <linux/mtd/map.h> > #include <linux/mtd/mtd.h> > #include <linux/mtd/partitions.h> > -- > 1.7.2.5 >
HI Paul, On 7 November 2011 02:26, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: >On 06/11/2011 (Sun 12:57) Jonas Gorski wrote: >> This patch is based on next-20111104 and probably should go through Paul's module.h cleanup tree. > > I can put it in the module.h tree, but for files that are using module.h > stuff, they can simply add it via the normal maintainer flow, since > files that use modular stuff should include module.h regardless and > there are no dependencies on the module.h content for things like this. I'm fine with either (though going through the MTD-tree will probably warrant a resubmission with a shortened changelog as it doesn't break there (yet)). @David, any preference there? Should I resubmit? Regards Jonas
On 11-11-07 05:12 AM, Jonas Gorski wrote: > HI Paul, > > On 7 November 2011 02:26, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: >> On 06/11/2011 (Sun 12:57) Jonas Gorski wrote: >>> This patch is based on next-20111104 and probably should go through Paul's module.h cleanup tree. >> >> I can put it in the module.h tree, but for files that are using module.h >> stuff, they can simply add it via the normal maintainer flow, since >> files that use modular stuff should include module.h regardless and >> there are no dependencies on the module.h content for things like this. > > I'm fine with either (though going through the MTD-tree will probably > warrant a resubmission with a shortened changelog as it doesn't break > there (yet)). OK, I'll grab it and put it in the small post-merge queue that I'll be sending in a couple of hours. P. > > @David, any preference there? Should I resubmit? > > Regards > Jonas
diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c index 608967f..736ca10 100644 --- a/drivers/mtd/maps/bcm963xx-flash.c +++ b/drivers/mtd/maps/bcm963xx-flash.c @@ -21,6 +21,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/module.h> #include <linux/mtd/map.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h>
module.h was previously implicitly included through mtd/mtd.h. Fixes the following build failure after the module.h cleanup: CC drivers/mtd/maps/bcm963xx-flash.o drivers/mtd/maps/bcm963xx-flash.c: In function 'bcm963xx_probe': drivers/mtd/maps/bcm963xx-flash.c:208:29: error: 'THIS_MODULE' undeclared (first use in this function) drivers/mtd/maps/bcm963xx-flash.c:208:29: note: each undeclared identifier is reported only once for each function it appears in drivers/mtd/maps/bcm963xx-flash.c: At top level: drivers/mtd/maps/bcm963xx-flash.c:255:12: error: 'THIS_MODULE' undeclared here (not in a function) drivers/mtd/maps/bcm963xx-flash.c:272:16: error: expected declaration specifiers or '...' before string constant drivers/mtd/maps/bcm963xx-flash.c:272:1: warning: data definition has no type or storage class drivers/mtd/maps/bcm963xx-flash.c:272:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE' drivers/mtd/maps/bcm963xx-flash.c:272:16: warning: function declaration isn't a prototype drivers/mtd/maps/bcm963xx-flash.c:273:20: error: expected declaration specifiers or '...' before string constant drivers/mtd/maps/bcm963xx-flash.c:273:1: warning: data definition has no type or storage class drivers/mtd/maps/bcm963xx-flash.c:273:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION' drivers/mtd/maps/bcm963xx-flash.c:273:20: warning: function declaration isn't a prototype drivers/mtd/maps/bcm963xx-flash.c:274:15: error: expected declaration specifiers or '...' before string constant drivers/mtd/maps/bcm963xx-flash.c:274:1: warning: data definition has no type or storage class drivers/mtd/maps/bcm963xx-flash.c:274:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/mtd/maps/bcm963xx-flash.c:274:15: warning: function declaration isn't a prototype drivers/mtd/maps/bcm963xx-flash.c:275:15: error: expected declaration specifiers or '...' before string constant drivers/mtd/maps/bcm963xx-flash.c:275:1: warning: data definition has no type or storage class drivers/mtd/maps/bcm963xx-flash.c:275:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/mtd/maps/bcm963xx-flash.c:275:15: warning: function declaration isn't a prototype drivers/mtd/maps/bcm963xx-flash.c:276:15: error: expected declaration specifiers or '...' before string constant drivers/mtd/maps/bcm963xx-flash.c:276:1: warning: data definition has no type or storage class drivers/mtd/maps/bcm963xx-flash.c:276:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/mtd/maps/bcm963xx-flash.c:276:15: warning: function declaration isn't a prototype make[7]: *** [drivers/mtd/maps/bcm963xx-flash.o] Error 1 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- This patch is based on next-20111104 and probably should go through Paul's module.h cleanup tree. drivers/mtd/maps/bcm963xx-flash.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)