Message ID | 1409310051-25726-1-git-send-email-yamada.m@jp.panasonic.com |
---|---|
State | Accepted |
Commit | a81b4708838261784fa473582607a6c687c39d00 |
Headers | show |
On Fri, Aug 29, 2014 at 08:00:51PM +0900, Masahiro Yamada wrote: > It looks like this header file is a concatenation of two headers. > Anyway, the include guard should be renamed and placed at the correct > postion and the license block in the middle should be deleted. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Looks sensible, since the header above the first diff hunk is the same modulo filename. (Side note: could we get checkpatch to complain about comment headers containing the name of the file they appear in? They're always either redundant or wrong.) Reviewed-by: Josh Triplett <josh@joshtriplett.org> > > drivers/mtd/nand/denali.h | 27 ++++----------------------- > 1 file changed, 4 insertions(+), 23 deletions(-) > > diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h > index 9668174..145bf88 100644 > --- a/drivers/mtd/nand/denali.h > +++ b/drivers/mtd/nand/denali.h > @@ -17,6 +17,9 @@ > * > */ > > +#ifndef __DENALI_H__ > +#define __DENALI_H__ > + > #include <linux/mtd/nand.h> > > #define DEVICE_RESET 0x0 > @@ -400,28 +403,6 @@ > #define ONFI_BLOOM_TIME 1 > #define MODE5_WORKAROUND 0 > > -/* lld_nand.h */ > -/* > - * NAND Flash Controller Device Driver > - * Copyright (c) 2009, Intel Corporation and its suppliers. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > - * > - * This program is distributed in the hope it will be useful, but WITHOUT > - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > - * more details. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program; if not, write to the Free Software Foundation, Inc., > - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. > - * > - */ > - > -#ifndef _LLD_NAND_ > -#define _LLD_NAND_ > > #define MODE_00 0x00000000 > #define MODE_01 0x04000000 > @@ -499,4 +480,4 @@ struct denali_nand_info { > extern int denali_init(struct denali_nand_info *denali); > extern void denali_remove(struct denali_nand_info *denali); > > -#endif /*_LLD_NAND_*/ > +#endif /* __DENALI_H__ */ > -- > 1.9.1 >
On Fri, 2014-08-29 at 11:30 -0700, Josh Triplett wrote: > (Side note: could we get checkpatch to complain about comment headers > containing the name of the file they appear in? They're always either > redundant or wrong.) Sure, if you can write a regex to determine an incorrect filename. Good luck with that.
On Sat, Aug 30, 2014 at 07:09:26AM -0700, Joe Perches wrote: > On Fri, 2014-08-29 at 11:30 -0700, Josh Triplett wrote: > > (Side note: could we get checkpatch to complain about comment headers > > containing the name of the file they appear in? They're always either > > redundant or wrong.) > > Sure, if you can write a regex to determine an > incorrect filename. I was thinking more about matching the current filename, which seems quite easy. - Josh Triplett
On Fri, Aug 29, 2014 at 08:00:51PM +0900, Masahiro Yamada wrote: > It looks like this header file is a concatenation of two headers. > Anyway, the include guard should be renamed and placed at the correct > postion and the license block in the middle should be deleted. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Pushed to l2-mtd.git. Thanks! Brian
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index 9668174..145bf88 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -17,6 +17,9 @@ * */ +#ifndef __DENALI_H__ +#define __DENALI_H__ + #include <linux/mtd/nand.h> #define DEVICE_RESET 0x0 @@ -400,28 +403,6 @@ #define ONFI_BLOOM_TIME 1 #define MODE5_WORKAROUND 0 -/* lld_nand.h */ -/* - * NAND Flash Controller Device Driver - * Copyright (c) 2009, Intel Corporation and its suppliers. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#ifndef _LLD_NAND_ -#define _LLD_NAND_ #define MODE_00 0x00000000 #define MODE_01 0x04000000 @@ -499,4 +480,4 @@ struct denali_nand_info { extern int denali_init(struct denali_nand_info *denali); extern void denali_remove(struct denali_nand_info *denali); -#endif /*_LLD_NAND_*/ +#endif /* __DENALI_H__ */
It looks like this header file is a concatenation of two headers. Anyway, the include guard should be renamed and placed at the correct postion and the license block in the middle should be deleted. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> --- drivers/mtd/nand/denali.h | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-)