usb: serial: Fix indentation style issue

PATCH Superseded Philip Munksgaard 6 participants 13 messages Oct 11, 2014 – Oct 22, 2014

Subsystems (2)

USB USB serial

lore

Share & tools

lore

Philip Munksgaard

author

2014-10-11 13:50 UTC #0 lore raw

PATCH 1/1 usb: serial: Fix indentation style issue

Fix a style issue

Signed-off-by Philip Munksgaard <[email protected]>

---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/usb/serial/option.c +1 -1

index d1a3f60..d88998d 100644
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
 	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },

Signature · 1 line

2.1.2

Greg KH

maintainer

2014-10-11 14:21 UTC #1 lore raw

Quoted 12 lines · Philip Munksgaard

Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/option.c +0 -0
index d1a3f60..d88998d 100644

drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619

Quoted 5 lines

drivers/usb/serial/option.c +1 -1

@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},

Why not fix the same 'space' issue on the line before this at the same time?

Lars Melin

2014-10-11 14:51 UTC #2 lore raw

Quoted 8 lines · Greg KH

Quoted 7 lines · Philip Munksgaard
Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
  drivers/usb/serial/option.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Quoted 13 lines

drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 10 lines
drivers/usb/serial/option.c +1 -1
index d1a3f60..d88998d 100644
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
  	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
  	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
    	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

Why put the closing brace on a new line?

Joe Perches

2014-10-11 15:36 UTC #3 lore raw

In reply to Greg KH

Quoted 2 lines · Greg KH

Quoted 1 line · Philip Munksgaard
Fix a style issue

[]

Quoted 1 line

drivers/usb/serial/option.c
Quoted 1 line
drivers/usb/serial/option.c +0 -0

[]

Quoted 9 lines

drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 6 lines
drivers/usb/serial/option.c +1 -1
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

I think there is no space issue on the previous line. What do you see Greg?

Greg KH

maintainer

2014-10-11 20:20 UTC #4 lore raw

Quoted 16 lines · Joe Perches

Quoted 2 lines · Greg KH
Quoted 1 line · Philip Munksgaard
Fix a style issue
[]
Quoted 1 line
drivers/usb/serial/option.c
Quoted 1 line
drivers/usb/serial/option.c +0 -0
[]
Quoted 9 lines
drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 6 lines
drivers/usb/serial/option.c +1 -1
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

Quoted 2 lines

I think there is no space issue on the previous line. What do you see Greg?

I see 'space space tab', just like this line that is being changed.

/me hands Joe a real editor.

Joe Perches

2014-10-12 01:02 UTC #5 lore raw

Quoted 17 lines · Greg KH

Quoted 16 lines · Joe Perches
Quoted 2 lines · Greg KH
Quoted 1 line · Philip Munksgaard
Fix a style issue
[]
Quoted 1 line
drivers/usb/serial/option.c
Quoted 1 line
drivers/usb/serial/option.c +0 -0
[]
Quoted 9 lines
drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 6 lines
drivers/usb/serial/option.c +1 -1
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

Quoted 4 lines

Quoted 2 lines
I think there is no space issue on the previous line. What do you see Greg?
I see 'space space tab', just like this line that is being changed.

Right, silly evolution previewer can't differentiate space/tab

Quoted 1 line

/me hands Joe a real editor.

Well, where is it? ;)

Johan Hovold

maintainer

2014-10-22 09:54 UTC #6 lore raw

In reply to Greg KH

Quoted 8 lines · Greg Kroah-Hartman

Quoted 7 lines · Philip Munksgaard
Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Quoted 13 lines

drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 10 lines
drivers/usb/serial/option.c +1 -1
index d1a3f60..d88998d 100644
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

And what about the remaining white-space issues in this file? Do we really want to go down this path?

I could take a patch fixing them all at once (this time). It's you who'll have to deal with the changed contexts when back porting device ids, Greg. ;)

Johan

Greg KH

maintainer

2014-10-22 14:20 UTC #7 lore raw

Quoted 23 lines · Johan Hovold

Quoted 8 lines · Greg Kroah-Hartman
Quoted 7 lines · Philip Munksgaard
Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 10 lines
drivers/usb/serial/option.c +1 -1
index d1a3f60..d88998d 100644
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

Quoted 2 lines

And what about the remaining white-space issues in this file? Do we really want to go down this path?

No, we don't, if you want to have patches be able to apply properly to older kernels, as you point out.

Just don't add new whitespace issues please, that's all.

thanks,

greg k-h

Philip Munksgaard

author

2014-10-22 14:40 UTC #8 lore raw

Quoted 24 lines · Greg KH

Quoted 23 lines · Johan Hovold
Quoted 21 lines · Greg Kroah-Hartman
Quoted 12 lines · Philip Munksgaard
Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/option.c +0 -0
index d1a3f60..d88998d 100644
drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 5 lines
drivers/usb/serial/option.c +1 -1
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
  { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
  { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
            .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-         },
+ },
Why not fix the same 'space' issue on the line before this at the same time?

Quoted 8 lines

Quoted 2 lines
And what about the remaining white-space issues in this file? Do we really want to go down this path?
No, we don't, if you want to have patches be able to apply properly to older kernels, as you point out.
Just don't add new whitespace issues please, that's all.

I'm a bit confused. I've already submitted a new patch that merges the two lines and fixes the whitespace issues on both (if you can't find it, let me know and I'll resend it), is there anything else I'm supposed to do?

Johan Hovold

maintainer

2014-10-22 14:43 UTC #9 lore raw

Quoted 31 lines · Philip Munksgaard

Quoted 30 lines · Greg KH
Quoted 23 lines · Johan Hovold
Quoted 8 lines · Greg Kroah-Hartman
Quoted 7 lines · Philip Munksgaard
Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 10 lines
drivers/usb/serial/option.c +1 -1
index d1a3f60..d88998d 100644
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
  { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
  { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
            .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-         },
+ },
Why not fix the same 'space' issue on the line before this at the same time?
Quoted 2 lines
And what about the remaining white-space issues in this file? Do we really want to go down this path?
No, we don't, if you want to have patches be able to apply properly to older kernels, as you point out.

Quoted 6 lines

Quoted 1 line
Just don't add new whitespace issues please, that's all.
I'm a bit confused. I've already submitted a new patch that merges the two lines and fixes the whitespace issues on both (if you can't find it, let me know and I'll resend it), is there anything else I'm supposed to do?

No, we're just not going to apply such fix-white-space patches, sorry.

Johan

Paul Zimmerman

2014-10-22 21:14 UTC #10 lore raw

In reply to Greg KH

Quoted 27 lines

From: [email protected] [mailto:[email protected]] On Behalf Of Greg KH
Sent: Wednesday, October 22, 2014 7:19 AM
Quoted 23 lines · Johan Hovold
Quoted 21 lines · Greg Kroah-Hartman
Quoted 12 lines · Philip Munksgaard
Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/option.c +0 -0
index d1a3f60..d88998d 100644
drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 5 lines
drivers/usb/serial/option.c +1 -1
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

Quoted 5 lines

Quoted 2 lines
And what about the remaining white-space issues in this file? Do we really want to go down this path?
No, we don't, if you want to have patches be able to apply properly to older kernels, as you point out.

git-apply --ignore-whitespace ?

Signature · 1 line

Paul

Greg KH

maintainer

2014-10-22 21:41 UTC #11 lore raw

Quoted 27 lines · Paul Zimmerman

Quoted 27 lines
From: [email protected] [mailto:[email protected]] On Behalf Of Greg KH
Sent: Wednesday, October 22, 2014 7:19 AM
Quoted 23 lines · Johan Hovold
Quoted 21 lines · Greg Kroah-Hartman
Quoted 12 lines · Philip Munksgaard
Fix a style issue
Signed-off-by Philip Munksgaard <[email protected]>
---
 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/option.c +0 -0
index d1a3f60..d88998d 100644
drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1619
Quoted 5 lines
drivers/usb/serial/option.c +1 -1
@@ -1616,7 +1616,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	},
Why not fix the same 'space' issue on the line before this at the same time?

Quoted 7 lines

Quoted 5 lines
Quoted 2 lines
And what about the remaining white-space issues in this file? Do we really want to go down this path?
No, we don't, if you want to have patches be able to apply properly to older kernels, as you point out.
git-apply --ignore-whitespace ?

Doesn't work with my code-flow for handling stable patches, sorry.

greg k-h

Philip Munksgaard

author

2014-10-11 15:24 UTC #12 lore raw

PATCH v2 1/1 usb: serial: Fix indentation style issue

In reply to Philip Munksgaard

Fix a style issue.

Signed-off-by Philip Munksgaard <[email protected]>

---
 drivers/usb/serial/option.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/usb/serial/option.c +1 -2

index d1a3f60..64ddc00 100644
@@ -1615,8 +1615,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
-  	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
+	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist },
 	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },

Signature · 1 line

2.1.2