Fix a style issue
Signed-off-by: Philip Munksgaard <[email protected]>
---
drivers/usb/serial/option.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index d1a3f60..d88998d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -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) },
--
2.1.2
On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> Fix a style issue
>
> Signed-off-by: Philip Munksgaard <[email protected]>
> ---
> drivers/usb/serial/option.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> index d1a3f60..d88998d 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -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?
On 2014-10-11 21:20, Greg KH wrote:
> On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
>> Fix a style issue
>>
>> Signed-off-by: Philip Munksgaard <[email protected]>
>> ---
>> drivers/usb/serial/option.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
>> index d1a3f60..d88998d 100644
>> --- a/drivers/usb/serial/option.c
>> +++ b/drivers/usb/serial/option.c
>> @@ -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?
Fix a style issue.
Signed-off-by: Philip Munksgaard <[email protected]>
---
drivers/usb/serial/option.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index d1a3f60..64ddc00 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -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) },
--
2.1.2
On Sat, 2014-10-11 at 07:20 -0700, Greg KH wrote:
> On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> > Fix a style issue
[]
> > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
[]
> > @@ -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?
On Sat, Oct 11, 2014 at 08:36:33AM -0700, Joe Perches wrote:
> On Sat, 2014-10-11 at 07:20 -0700, Greg KH wrote:
> > On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> > > Fix a style issue
> []
> > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> []
> > > @@ -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?
I see 'space space tab', just like this line that is being changed.
/me hands Joe a real editor.
On Sat, 2014-10-11 at 13:19 -0700, Greg KH wrote:
> On Sat, Oct 11, 2014 at 08:36:33AM -0700, Joe Perches wrote:
> > On Sat, 2014-10-11 at 07:20 -0700, Greg KH wrote:
> > > On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> > > > Fix a style issue
> > []
> > > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> > []
> > > > @@ -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?
>
> I see 'space space tab', just like this line that is being changed.
Right, silly evolution previewer can't differentiate space/tab
> /me hands Joe a real editor.
Well, where is it? ;)
On Sat, Oct 11, 2014 at 07:20:49AM -0700, Greg Kroah-Hartman wrote:
> On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> > Fix a style issue
> >
> > Signed-off-by: Philip Munksgaard <[email protected]>
> > ---
> > drivers/usb/serial/option.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> > index d1a3f60..d88998d 100644
> > --- a/drivers/usb/serial/option.c
> > +++ b/drivers/usb/serial/option.c
> > @@ -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
On Wed, Oct 22, 2014 at 11:51:12AM +0200, Johan Hovold wrote:
> On Sat, Oct 11, 2014 at 07:20:49AM -0700, Greg Kroah-Hartman wrote:
> > On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> > > Fix a style issue
> > >
> > > Signed-off-by: Philip Munksgaard <[email protected]>
> > > ---
> > > drivers/usb/serial/option.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> > > index d1a3f60..d88998d 100644
> > > --- a/drivers/usb/serial/option.c
> > > +++ b/drivers/usb/serial/option.c
> > > @@ -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?
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
On 22 October 2014 16:18, Greg KH <[email protected]> wrote:
> On Wed, Oct 22, 2014 at 11:51:12AM +0200, Johan Hovold wrote:
>> On Sat, Oct 11, 2014 at 07:20:49AM -0700, Greg Kroah-Hartman wrote:
>> > On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
>> > > Fix a style issue
>> > >
>> > > Signed-off-by: Philip Munksgaard <[email protected]>
>> > > ---
>> > > drivers/usb/serial/option.c | 2 +-
>> > > 1 file changed, 1 insertion(+), 1 deletion(-)
>> > >
>> > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
>> > > index d1a3f60..d88998d 100644
>> > > --- a/drivers/usb/serial/option.c
>> > > +++ b/drivers/usb/serial/option.c
>> > > @@ -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?
>
> 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?
On Wed, Oct 22, 2014 at 04:40:24PM +0200, Philip Munksgaard wrote:
> On 22 October 2014 16:18, Greg KH <[email protected]> wrote:
> > On Wed, Oct 22, 2014 at 11:51:12AM +0200, Johan Hovold wrote:
> >> On Sat, Oct 11, 2014 at 07:20:49AM -0700, Greg Kroah-Hartman wrote:
> >> > On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> >> > > Fix a style issue
> >> > >
> >> > > Signed-off-by: Philip Munksgaard <[email protected]>
> >> > > ---
> >> > > drivers/usb/serial/option.c | 2 +-
> >> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> >> > >
> >> > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> >> > > index d1a3f60..d88998d 100644
> >> > > --- a/drivers/usb/serial/option.c
> >> > > +++ b/drivers/usb/serial/option.c
> >> > > @@ -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?
> >
> > 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?
No, we're just not going to apply such fix-white-space patches, sorry.
Johan
> From: [email protected] [mailto:[email protected]] On Behalf Of Greg KH
> Sent: Wednesday, October 22, 2014 7:19 AM
>
> On Wed, Oct 22, 2014 at 11:51:12AM +0200, Johan Hovold wrote:
> > On Sat, Oct 11, 2014 at 07:20:49AM -0700, Greg Kroah-Hartman wrote:
> > > On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> > > > Fix a style issue
> > > >
> > > > Signed-off-by: Philip Munksgaard <[email protected]>
> > > > ---
> > > > drivers/usb/serial/option.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> > > > index d1a3f60..d88998d 100644
> > > > --- a/drivers/usb/serial/option.c
> > > > +++ b/drivers/usb/serial/option.c
> > > > @@ -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?
>
> 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 ?
--
Paul
On Wed, Oct 22, 2014 at 09:14:14PM +0000, Paul Zimmerman wrote:
> > From: [email protected] [mailto:[email protected]] On Behalf Of Greg KH
> > Sent: Wednesday, October 22, 2014 7:19 AM
> >
> > On Wed, Oct 22, 2014 at 11:51:12AM +0200, Johan Hovold wrote:
> > > On Sat, Oct 11, 2014 at 07:20:49AM -0700, Greg Kroah-Hartman wrote:
> > > > On Sat, Oct 11, 2014 at 03:49:43PM +0200, Philip Munksgaard wrote:
> > > > > Fix a style issue
> > > > >
> > > > > Signed-off-by: Philip Munksgaard <[email protected]>
> > > > > ---
> > > > > drivers/usb/serial/option.c | 2 +-
> > > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> > > > > index d1a3f60..d88998d 100644
> > > > > --- a/drivers/usb/serial/option.c
> > > > > +++ b/drivers/usb/serial/option.c
> > > > > @@ -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?
> >
> > 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