2008-10-18 03:52:51

by Huang Weiyi

[permalink] [raw]
Subject: staging: me4000: remove duplicated #include's

Removed duplicated #include's in drivers/staging/me4000/me4000.c
asm/uaccess.h
linux/fs.h

Signed-off-by: Huang Weiyi <[email protected]>

diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
index 862dd7f..90de6f0 100644
--- a/drivers/staging/me4000/me4000.c
+++ b/drivers/staging/me4000/me4000.c
@@ -30,7 +30,6 @@
#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/delay.h>
-#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/unistd.h>
#include <linux/list.h>
@@ -39,7 +38,6 @@
#include <linux/poll.h>
#include <linux/vmalloc.h>
#include <asm/pgtable.h>
-#include <asm/uaccess.h>
#include <linux/types.h>

#include <linux/slab.h>


2008-10-20 21:38:36

by Greg KH

[permalink] [raw]
Subject: Re: staging: me4000: remove duplicated #include's

On Sat, Oct 18, 2008 at 11:52:15AM +0800, Huang Weiyi wrote:
> Removed duplicated #include's in drivers/staging/me4000/me4000.c
> asm/uaccess.h
> linux/fs.h
>
> Signed-off-by: Huang Weiyi <[email protected]>
>
> diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
> index 862dd7f..90de6f0 100644
> --- a/drivers/staging/me4000/me4000.c
> +++ b/drivers/staging/me4000/me4000.c
> @@ -30,7 +30,6 @@
> #include <asm/uaccess.h>
> #include <linux/errno.h>
> #include <linux/delay.h>
> -#include <linux/fs.h>
> #include <linux/mm.h>
> #include <linux/unistd.h>
> #include <linux/list.h>
> @@ -39,7 +38,6 @@
> #include <linux/poll.h>
> #include <linux/vmalloc.h>
> #include <asm/pgtable.h>
> -#include <asm/uaccess.h>
> #include <linux/types.h>
>
> #include <linux/slab.h>

Hm, this doesn't apply anymore as some cleanups went in that should have
just made this not needed.

But if you have a script I can run somewhere to verify it, I'd
appreciate it.

thanks,

greg k-h

2008-10-26 21:34:47

by Adrian Bunk

[permalink] [raw]
Subject: Re: staging: me4000: remove duplicated #include's

On Mon, Oct 20, 2008 at 02:18:22PM -0700, Greg KH wrote:
> On Sat, Oct 18, 2008 at 11:52:15AM +0800, Huang Weiyi wrote:
> > Removed duplicated #include's in drivers/staging/me4000/me4000.c
> > asm/uaccess.h
> > linux/fs.h
> >
> > Signed-off-by: Huang Weiyi <[email protected]>
> >
> > diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
> > index 862dd7f..90de6f0 100644
> > --- a/drivers/staging/me4000/me4000.c
> > +++ b/drivers/staging/me4000/me4000.c
> > @@ -30,7 +30,6 @@
> > #include <asm/uaccess.h>
> > #include <linux/errno.h>
> > #include <linux/delay.h>
> > -#include <linux/fs.h>
> > #include <linux/mm.h>
> > #include <linux/unistd.h>
> > #include <linux/list.h>
> > @@ -39,7 +38,6 @@
> > #include <linux/poll.h>
> > #include <linux/vmalloc.h>
> > #include <asm/pgtable.h>
> > -#include <asm/uaccess.h>
> > #include <linux/types.h>
> >
> > #include <linux/slab.h>
>
> Hm, this doesn't apply anymore as some cleanups went in that should have
> just made this not needed.
>
> But if you have a script I can run somewhere to verify it, I'd
> appreciate it.

linux-2.6$ make help | grep include
includecheck - Check for duplicate included header files
linux-2.6$

> thanks,
>
> greg k-h

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2008-10-26 21:40:21

by J.R. Mauro

[permalink] [raw]
Subject: Re: staging: me4000: remove duplicated #include's

On Sun, Oct 26, 2008 at 5:33 PM, Adrian Bunk <[email protected]> wrote:
> On Mon, Oct 20, 2008 at 02:18:22PM -0700, Greg KH wrote:
>> On Sat, Oct 18, 2008 at 11:52:15AM +0800, Huang Weiyi wrote:
>> > Removed duplicated #include's in drivers/staging/me4000/me4000.c
>> > asm/uaccess.h
>> > linux/fs.h
>> >
>> > Signed-off-by: Huang Weiyi <[email protected]>
>> >
>> > diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
>> > index 862dd7f..90de6f0 100644
>> > --- a/drivers/staging/me4000/me4000.c
>> > +++ b/drivers/staging/me4000/me4000.c
>> > @@ -30,7 +30,6 @@
>> > #include <asm/uaccess.h>
>> > #include <linux/errno.h>
>> > #include <linux/delay.h>
>> > -#include <linux/fs.h>
>> > #include <linux/mm.h>
>> > #include <linux/unistd.h>
>> > #include <linux/list.h>
>> > @@ -39,7 +38,6 @@
>> > #include <linux/poll.h>
>> > #include <linux/vmalloc.h>
>> > #include <asm/pgtable.h>
>> > -#include <asm/uaccess.h>
>> > #include <linux/types.h>
>> >
>> > #include <linux/slab.h>
>>
>> Hm, this doesn't apply anymore as some cleanups went in that should have
>> just made this not needed.
>>
>> But if you have a script I can run somewhere to verify it, I'd
>> appreciate it.
>
> linux-2.6$ make help | grep include
> includecheck - Check for duplicate included header files
> linux-2.6$

Is there a way to get this to just check in a user-specified
directory? I didn't see any options for that and adding
M=drivers/staging didn't help.

>
>> thanks,
>>
>> greg k-h
>
> cu
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2008-10-26 22:06:50

by Adrian Bunk

[permalink] [raw]
Subject: Re: staging: me4000: remove duplicated #include's

On Sun, Oct 26, 2008 at 05:40:04PM -0400, J.R. Mauro wrote:
> On Sun, Oct 26, 2008 at 5:33 PM, Adrian Bunk <[email protected]> wrote:
> > On Mon, Oct 20, 2008 at 02:18:22PM -0700, Greg KH wrote:
> >> On Sat, Oct 18, 2008 at 11:52:15AM +0800, Huang Weiyi wrote:
> >> > Removed duplicated #include's in drivers/staging/me4000/me4000.c
> >> > asm/uaccess.h
> >> > linux/fs.h
> >> >
> >> > Signed-off-by: Huang Weiyi <[email protected]>
> >> >
> >> > diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
> >> > index 862dd7f..90de6f0 100644
> >> > --- a/drivers/staging/me4000/me4000.c
> >> > +++ b/drivers/staging/me4000/me4000.c
> >> > @@ -30,7 +30,6 @@
> >> > #include <asm/uaccess.h>
> >> > #include <linux/errno.h>
> >> > #include <linux/delay.h>
> >> > -#include <linux/fs.h>
> >> > #include <linux/mm.h>
> >> > #include <linux/unistd.h>
> >> > #include <linux/list.h>
> >> > @@ -39,7 +38,6 @@
> >> > #include <linux/poll.h>
> >> > #include <linux/vmalloc.h>
> >> > #include <asm/pgtable.h>
> >> > -#include <asm/uaccess.h>
> >> > #include <linux/types.h>
> >> >
> >> > #include <linux/slab.h>
> >>
> >> Hm, this doesn't apply anymore as some cleanups went in that should have
> >> just made this not needed.
> >>
> >> But if you have a script I can run somewhere to verify it, I'd
> >> appreciate it.
> >
> > linux-2.6$ make help | grep include
> > includecheck - Check for duplicate included header files
> > linux-2.6$
>
> Is there a way to get this to just check in a user-specified
> directory? I didn't see any options for that and adding
> M=drivers/staging didn't help.

Pipe the output through grep.

Or if you really want to limit what gets checked, setting the path in
the Makefile is trivial.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2008-10-27 13:45:41

by J.R. Mauro

[permalink] [raw]
Subject: Re: staging: me4000: remove duplicated #include's

On Sun, Oct 26, 2008 at 6:05 PM, Adrian Bunk <[email protected]> wrote:
> On Sun, Oct 26, 2008 at 05:40:04PM -0400, J.R. Mauro wrote:
>> On Sun, Oct 26, 2008 at 5:33 PM, Adrian Bunk <[email protected]> wrote:
>> > On Mon, Oct 20, 2008 at 02:18:22PM -0700, Greg KH wrote:
>> >> On Sat, Oct 18, 2008 at 11:52:15AM +0800, Huang Weiyi wrote:
>> >> > Removed duplicated #include's in drivers/staging/me4000/me4000.c
>> >> > asm/uaccess.h
>> >> > linux/fs.h
>> >> >
>> >> > Signed-off-by: Huang Weiyi <[email protected]>
>> >> >
>> >> > diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
>> >> > index 862dd7f..90de6f0 100644
>> >> > --- a/drivers/staging/me4000/me4000.c
>> >> > +++ b/drivers/staging/me4000/me4000.c
>> >> > @@ -30,7 +30,6 @@
>> >> > #include <asm/uaccess.h>
>> >> > #include <linux/errno.h>
>> >> > #include <linux/delay.h>
>> >> > -#include <linux/fs.h>
>> >> > #include <linux/mm.h>
>> >> > #include <linux/unistd.h>
>> >> > #include <linux/list.h>
>> >> > @@ -39,7 +38,6 @@
>> >> > #include <linux/poll.h>
>> >> > #include <linux/vmalloc.h>
>> >> > #include <asm/pgtable.h>
>> >> > -#include <asm/uaccess.h>
>> >> > #include <linux/types.h>
>> >> >
>> >> > #include <linux/slab.h>
>> >>
>> >> Hm, this doesn't apply anymore as some cleanups went in that should have
>> >> just made this not needed.
>> >>
>> >> But if you have a script I can run somewhere to verify it, I'd
>> >> appreciate it.
>> >
>> > linux-2.6$ make help | grep include
>> > includecheck - Check for duplicate included header files
>> > linux-2.6$
>>
>> Is there a way to get this to just check in a user-specified
>> directory? I didn't see any options for that and adding
>> M=drivers/staging didn't help.
>
> Pipe the output through grep.
>
> Or if you really want to limit what gets checked, setting the path in
> the Makefile is trivial.

Yes, I guess I meant something like this quick-n-dirty patch. I got
bored waiting for the includecheck to finish on the whole source tree,
so it's nice to be able to tell it to check only what I'm interested
in.

(don't try to apply this patch as gmail mutilates tabs)
---

diff --git a/Makefile b/Makefile
index e9c5d47..9b7891c 100644
--- a/Makefile
+++ b/Makefile
@@ -1524,7 +1524,7 @@ tags: FORCE
# ---------------------------------------------------------------------------

includecheck:
- find * $(RCS_FIND_IGNORE) \
+ find $(if $(M),$(M)/)* $(RCS_FIND_IGNORE) \
-name '*.[hcS]' -type f -print | sort \
| xargs $(PERL) -w $(srctree)/scripts/checkincludes.pl



>
> cu
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
>