Patchwork drivers/usb/storage/sddr55.c: Remove duplicate header

login
register
mail settings
Submitter Sabyasachi Gupta
Date Jan. 10, 2019, 7:40 a.m.
Message ID <5c36f6ef.1c69fb81.9d82d.5592@mx.google.com>
Download mbox | patch
Permalink /patch/696399/
State New
Headers show

Comments

Sabyasachi Gupta - Jan. 10, 2019, 7:40 a.m.
Remove unusual_sddr55.h which is included more than once

Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com>
---
 drivers/usb/storage/sddr55.c | 1 -
 1 file changed, 1 deletion(-)
Greg Kroah-Hartman - Jan. 11, 2019, 9:10 a.m.
On Thu, Jan 10, 2019 at 01:10:25PM +0530, Sabyasachi Gupta wrote:
> Remove unusual_sddr55.h which is included more than once
> 
> Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com>
> ---
>  drivers/usb/storage/sddr55.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
> index b8527c5..96bf7ee 100644
> --- a/drivers/usb/storage/sddr55.c
> +++ b/drivers/usb/storage/sddr55.c
> @@ -62,7 +62,6 @@ MODULE_DEVICE_TABLE(usb, sddr55_usb_ids);
>  }
>  
>  static struct us_unusual_dev sddr55_unusual_dev_list[] = {
> -#	include "unusual_sddr55.h"
>  	{ }		/* Terminating entry */
>  };

As Oliver said on the other patch, this breaks the code.  Please do not
blindly make changes without understanding what the code does.

thanks,

greg k-h
Oliver Neukum - Jan. 11, 2019, 10:59 a.m.
On Fr, 2019-01-11 at 10:10 +0100, Greg KH wrote:
> On Thu, Jan 10, 2019 at 01:10:25PM +0530, Sabyasachi Gupta wrote:
> > Remove unusual_sddr55.h which is included more than once
> > 
> > Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com>
> > ---
> >  drivers/usb/storage/sddr55.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
> > index b8527c5..96bf7ee 100644
> > --- a/drivers/usb/storage/sddr55.c
> > +++ b/drivers/usb/storage/sddr55.c
> > @@ -62,7 +62,6 @@ MODULE_DEVICE_TABLE(usb, sddr55_usb_ids);
> >  }
> >  
> >  static struct us_unusual_dev sddr55_unusual_dev_list[] = {
> > -#	include "unusual_sddr55.h"
> >  	{ }		/* Terminating entry */
> >  };
> 
> As Oliver said on the other patch, this breaks the code.  Please do not
> blindly make changes without understanding what the code does.

Maybe this should be explained. The file that is included does have
a name ending in .h. But it is not simply declarations, for which
newer trendy languages would use a a statement like ¨import".

"unusual_sddr55.h" is a list of devices. This list is used in
multiple places. And it needs to be identical in all those places.
Hence it is included. These are true includes. There is nothing wrong
with that code.

Our complaint is not that your fix is wrong, but there is nothing wrong
with the code as is. Including this list is the good thing to do.
Your wish to clean up the kernel is appreciated. But please find a
place that actually needs to be cleaned up.

	Regards
		Oliver

Patch

diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index b8527c5..96bf7ee 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -62,7 +62,6 @@  MODULE_DEVICE_TABLE(usb, sddr55_usb_ids);
 }
 
 static struct us_unusual_dev sddr55_unusual_dev_list[] = {
-#	include "unusual_sddr55.h"
 	{ }		/* Terminating entry */
 };