2014-12-02 09:05:14

by Sudip Mukherjee

Subject: [PATCH] staging: unisys: remove duplicate header

these header files were included two times

Signed-off-by: Sudip Mukherjee <[email protected]>
---
drivers/staging/unisys/include/timskmod.h | 1 -
drivers/staging/unisys/uislib/uisutils.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index de11f44..cff7983 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -31,7 +31,6 @@
#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
-#include <linux/sched.h>
#include <linux/wait.h>
#include <linux/vmalloc.h>
#include <linux/proc_fs.h>
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index a8466e3..7149add 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -27,7 +27,6 @@
#include "vbushelper.h"
#include <linux/uuid.h>
#include <linux/skbuff.h>
-#include <linux/uuid.h>
#ifdef CONFIG_HIGHMEM
#include <linux/highmem.h>
#endif
--
1.8.1.2

2014-12-02 09:46:59

by Jeremiah Mahler

Subject: Re: [PATCH] staging: unisys: remove duplicate header

Sudip,

On Tue, Dec 02, 2014 at 02:34:58PM +0530, Sudip Mukherjee wrote:
> these header files were included two times
>
> Signed-off-by: Sudip Mukherjee <[email protected]>
> ---
> drivers/staging/unisys/include/timskmod.h | 1 -
> drivers/staging/unisys/uislib/uisutils.c | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
> index de11f44..cff7983 100644
> --- a/drivers/staging/unisys/include/timskmod.h
> +++ b/drivers/staging/unisys/include/timskmod.h
> @@ -31,7 +31,6 @@
> #include <linux/slab.h>
> #include <linux/errno.h>
> #include <linux/interrupt.h>
> -#include <linux/sched.h>
> #include <linux/wait.h>
> #include <linux/vmalloc.h>
> #include <linux/proc_fs.h>
> diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
> index a8466e3..7149add 100644
> --- a/drivers/staging/unisys/uislib/uisutils.c
> +++ b/drivers/staging/unisys/uislib/uisutils.c
> @@ -27,7 +27,6 @@
> #include "vbushelper.h"
> #include <linux/uuid.h>
> #include <linux/skbuff.h>
> -#include <linux/uuid.h>
> #ifdef CONFIG_HIGHMEM
> #include <linux/highmem.h>
> #endif

There are two duplicates of the second one. Lines: 21, 28 and 30.

Good find :)

--
- Jeremiah Mahler

2014-12-02 10:39:21

by Sudip Mukherjee

Subject: Re: [PATCH] staging: unisys: remove duplicate header

On Tue, Dec 02, 2014 at 01:46:54AM -0800, Jeremiah Mahler wrote:
> Sudip,
>
> On Tue, Dec 02, 2014 at 02:34:58PM +0530, Sudip Mukherjee wrote:
> > these header files were included two times
> >
> > Signed-off-by: Sudip Mukherjee <[email protected]>
> > ---
> > drivers/staging/unisys/include/timskmod.h | 1 -
> > drivers/staging/unisys/uislib/uisutils.c | 1 -
> > 2 files changed, 2 deletions(-)
> >
> > diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
> > index de11f44..cff7983 100644
> > --- a/drivers/staging/unisys/include/timskmod.h
> > +++ b/drivers/staging/unisys/include/timskmod.h
> > @@ -31,7 +31,6 @@
> > #include <linux/slab.h>
> > #include <linux/errno.h>
> > #include <linux/interrupt.h>
> > -#include <linux/sched.h>
> > #include <linux/wait.h>
> > #include <linux/vmalloc.h>
> > #include <linux/proc_fs.h>
> > diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
> > index a8466e3..7149add 100644
> > --- a/drivers/staging/unisys/uislib/uisutils.c
> > +++ b/drivers/staging/unisys/uislib/uisutils.c
> > @@ -27,7 +27,6 @@
> > #include "vbushelper.h"
> > #include <linux/uuid.h>
> > #include <linux/skbuff.h>
> > -#include <linux/uuid.h>
> > #ifdef CONFIG_HIGHMEM
> > #include <linux/highmem.h>
> > #endif
>
> There are two duplicates of the second one. Lines: 21, 28 and 30.

oops ... missed that
i will send a v2

thanks
sudip
>
> Good find :
>
> --
> - Jeremiah Mahler