* [PATCH] staging: vt6656: Add spaces around '+' operator
@ 2016-09-26 17:48 Martin Alonso
2016-09-26 18:02 ` Joe Perches
2016-09-27 11:10 ` [PATCH] staging: vt6656: Add spaces around '+' operator Greg KH
0 siblings, 2 replies; 11+ messages in thread
From: Martin Alonso @ 2016-09-26 17:48 UTC (permalink / raw)
To: forest, gregkh, pasteka; +Cc: devel, linux-kernel, Martin Alonso
Fix coding style issue "spaces preferred around '+'
detected by checkpatch.pl in dpc.c file.
Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
---
drivers/staging/vt6656/dpc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 6019aac..900cd5c 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -75,8 +75,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
skb_data = (u8 *)skb->data;
- rx_sts = skb_data+4;
- rx_rate = skb_data+5;
+ rx_sts = skb_data + 4;
+ rx_rate = skb_data + 5;
/* real Frame Size = USBframe_size -4WbkStatus - 4RxStatus */
/* -8TSF - 4RSR - 4SQ3 - ?Padding */
--
2.8.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] staging: vt6656: Add spaces around '+' operator
2016-09-26 17:48 [PATCH] staging: vt6656: Add spaces around '+' operator Martin Alonso
@ 2016-09-26 18:02 ` Joe Perches
2016-09-27 16:59 ` Martin Alonso
2016-09-27 11:10 ` [PATCH] staging: vt6656: Add spaces around '+' operator Greg KH
1 sibling, 1 reply; 11+ messages in thread
From: Joe Perches @ 2016-09-26 18:02 UTC (permalink / raw)
To: Martin Alonso, forest, gregkh, pasteka; +Cc: devel, linux-kernel
On Mon, 2016-09-26 at 14:48 -0300, Martin Alonso wrote:
> Fix coding style issue "spaces preferred around '+'
> detected by checkpatch.pl in dpc.c file.
[]
> diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
[]
> @@ -75,8 +75,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
>
> > skb_data = (u8 *)skb->data;
>
> - rx_sts = skb_data+4;
> - rx_rate = skb_data+5;
> + rx_sts = skb_data + 4;
> + rx_rate = skb_data + 5;
>
> /* real Frame Size = USBframe_size -4WbkStatus - 4RxStatus */
> /* -8TSF - 4RSR - 4SQ3 - ?Padding */
You might as well make rx_rate u8 instead of u8 *
and change the uses of rx_rate. rx_sts isn't used
anywhere at all and could be removed.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] staging: vt6656: Add spaces around '+' operator
2016-09-26 17:48 [PATCH] staging: vt6656: Add spaces around '+' operator Martin Alonso
2016-09-26 18:02 ` Joe Perches
@ 2016-09-27 11:10 ` Greg KH
2016-09-27 11:49 ` Martin Alonso
1 sibling, 1 reply; 11+ messages in thread
From: Greg KH @ 2016-09-27 11:10 UTC (permalink / raw)
To: Martin Alonso; +Cc: forest, pasteka, devel, linux-kernel
On Mon, Sep 26, 2016 at 02:48:24PM -0300, Martin Alonso wrote:
> Fix coding style issue "spaces preferred around '+'
> detected by checkpatch.pl in dpc.c file.
>
> Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
> ---
> drivers/staging/vt6656/dpc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
> index 6019aac..900cd5c 100644
> --- a/drivers/staging/vt6656/dpc.c
> +++ b/drivers/staging/vt6656/dpc.c
> @@ -75,8 +75,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
>
> skb_data = (u8 *)skb->data;
>
> - rx_sts = skb_data+4;
> - rx_rate = skb_data+5;
> + rx_sts = skb_data + 4;
> + rx_rate = skb_data + 5;
>
> /* real Frame Size = USBframe_size -4WbkStatus - 4RxStatus */
> /* -8TSF - 4RSR - 4SQ3 - ?Padding */
> --
> 2.8.0
>
Doesn't apply to my tree, did someone do this before you? You are
working against linux-next, right?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] staging: vt6656: Add spaces around '+' operator
2016-09-27 11:10 ` [PATCH] staging: vt6656: Add spaces around '+' operator Greg KH
@ 2016-09-27 11:49 ` Martin Alonso
0 siblings, 0 replies; 11+ messages in thread
From: Martin Alonso @ 2016-09-27 11:49 UTC (permalink / raw)
To: Greg KH; +Cc: forest, pasteka, devel, linux-kernel
On Tue, Sep 27, 2016 at 01:10:04PM +0200, Greg KH wrote:
> On Mon, Sep 26, 2016 at 02:48:24PM -0300, Martin Alonso wrote:
> > Fix coding style issue "spaces preferred around '+'
> > detected by checkpatch.pl in dpc.c file.
> >
> > Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
> > ---
> > drivers/staging/vt6656/dpc.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
> > index 6019aac..900cd5c 100644
> > --- a/drivers/staging/vt6656/dpc.c
> > +++ b/drivers/staging/vt6656/dpc.c
> > @@ -75,8 +75,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
> >
> > skb_data = (u8 *)skb->data;
> >
> > - rx_sts = skb_data+4;
> > - rx_rate = skb_data+5;
> > + rx_sts = skb_data + 4;
> > + rx_rate = skb_data + 5;
> >
> > /* real Frame Size = USBframe_size -4WbkStatus - 4RxStatus */
> > /* -8TSF - 4RSR - 4SQ3 - ?Padding */
> > --
> > 2.8.0
> >
>
> Doesn't apply to my tree, did someone do this before you? You are
> working against linux-next, right?
>
> thanks,
>
> greg k-h
I wasn't working against linux-next as i though.
Sorry for the annoyance.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] staging: vt6656: Add spaces around '+' operator
2016-09-26 18:02 ` Joe Perches
@ 2016-09-27 16:59 ` Martin Alonso
2016-09-27 17:52 ` [PATCH 1/2] staging: vt6656: Remove unused variable 'rx_sts' Martin Alonso
0 siblings, 1 reply; 11+ messages in thread
From: Martin Alonso @ 2016-09-27 16:59 UTC (permalink / raw)
To: Joe Perches; +Cc: forest, gregkh, pasteka, devel, linux-kernel
On Mon, Sep 26, 2016 at 11:02:33AM -0700, Joe Perches wrote:
> On Mon, 2016-09-26 at 14:48 -0300, Martin Alonso wrote:
> > Fix coding style issue "spaces preferred around '+'
> > detected by checkpatch.pl in dpc.c file.
> []
> > diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
> []
> > @@ -75,8 +75,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
> >
> > > skb_data = (u8 *)skb->data;
> >
> > - rx_sts = skb_data+4;
> > - rx_rate = skb_data+5;
> > + rx_sts = skb_data + 4;
> > + rx_rate = skb_data + 5;
> >
> > /* real Frame Size = USBframe_size -4WbkStatus - 4RxStatus */
> > /* -8TSF - 4RSR - 4SQ3 - ?Padding */
>
> You might as well make rx_rate u8 instead of u8 *
> and change the uses of rx_rate. rx_sts isn't used
> anywhere at all and could be removed.
>
I'll send two patches to fix this issues.
Regards.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] staging: vt6656: Remove unused variable 'rx_sts'
2016-09-27 16:59 ` Martin Alonso
@ 2016-09-27 17:52 ` Martin Alonso
2016-09-27 17:52 ` [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 * Martin Alonso
0 siblings, 1 reply; 11+ messages in thread
From: Martin Alonso @ 2016-09-27 17:52 UTC (permalink / raw)
To: joe, forest, gregkh, pasteka; +Cc: devel, linux-kernel, Martin Alonso
As suggested by Joe Perches, rx_sts is not
used anywhere and could be removed.
Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
---
drivers/staging/vt6656/dpc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index c352c70..655f000 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -46,7 +46,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
__le64 *tsf_time;
u32 frame_size;
int ii, r;
- u8 *rx_sts, *rx_rate, *sq, *sq_3;
+ u8 *rx_rate, *sq, *sq_3;
u32 wbk_status;
u8 *skb_data;
u16 *pay_load_len;
@@ -75,7 +75,6 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
skb_data = (u8 *)skb->data;
- rx_sts = skb_data + 4;
rx_rate = skb_data + 5;
/* real Frame Size = USBframe_size -4WbkStatus - 4RxStatus */
--
2.8.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 *
2016-09-27 17:52 ` [PATCH 1/2] staging: vt6656: Remove unused variable 'rx_sts' Martin Alonso
@ 2016-09-27 17:52 ` Martin Alonso
2016-09-28 7:40 ` Dan Carpenter
2016-09-28 9:34 ` Greg KH
0 siblings, 2 replies; 11+ messages in thread
From: Martin Alonso @ 2016-09-27 17:52 UTC (permalink / raw)
To: joe, forest, gregkh, pasteka; +Cc: devel, linux-kernel, Martin Alonso
Change the type and uses of rx_rate.
Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
---
drivers/staging/vt6656/dpc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 655f000..782b7d7 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -46,7 +46,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
__le64 *tsf_time;
u32 frame_size;
int ii, r;
- u8 *rx_rate, *sq, *sq_3;
+ u8 rx_rate;
+ u8 *sq, *sq_3;
u32 wbk_status;
u8 *skb_data;
u16 *pay_load_len;
@@ -75,7 +76,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
skb_data = (u8 *)skb->data;
- rx_rate = skb_data + 5;
+ rx_rate = *(skb_data + 5);
/* real Frame Size = USBframe_size -4WbkStatus - 4RxStatus */
/* -8TSF - 4RSR - 4SQ3 - ?Padding */
@@ -96,7 +97,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
sband = hw->wiphy->bands[hw->conf.chandef.chan->band];
for (r = RATE_1M; r < MAX_RATE; r++) {
- if (*rx_rate == rate[r])
+ if (rx_rate == rate[r])
break;
}
@@ -110,7 +111,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
}
if (ii == sband->n_bitrates) {
- dev_dbg(&priv->usb->dev, "Wrong RxRate %x\n", *rx_rate);
+ dev_dbg(&priv->usb->dev, "Wrong RxRate %x\n", rx_rate);
return false;
}
--
2.8.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 *
2016-09-27 17:52 ` [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 * Martin Alonso
@ 2016-09-28 7:40 ` Dan Carpenter
2016-09-30 18:53 ` Malcolm Priestley
2016-09-28 9:34 ` Greg KH
1 sibling, 1 reply; 11+ messages in thread
From: Dan Carpenter @ 2016-09-28 7:40 UTC (permalink / raw)
To: Martin Alonso; +Cc: joe, forest, gregkh, pasteka, devel, linux-kernel
On Tue, Sep 27, 2016 at 02:52:49PM -0300, Martin Alonso wrote:
> Change the type and uses of rx_rate.
>
> Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
> ---
> drivers/staging/vt6656/dpc.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
> index 655f000..782b7d7 100644
> --- a/drivers/staging/vt6656/dpc.c
> +++ b/drivers/staging/vt6656/dpc.c
> @@ -46,7 +46,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
> __le64 *tsf_time;
> u32 frame_size;
> int ii, r;
> - u8 *rx_rate, *sq, *sq_3;
> + u8 rx_rate;
> + u8 *sq, *sq_3;
> u32 wbk_status;
> u8 *skb_data;
> u16 *pay_load_len;
> @@ -75,7 +76,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
>
> skb_data = (u8 *)skb->data;
>
> - rx_rate = skb_data + 5;
> + rx_rate = *(skb_data + 5);
It occurs to me that we don't check that skb->len is large enough here.
We just assume it has at least 5 bytes.
TODO: vt6656: verify skb->len before using it.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 *
2016-09-27 17:52 ` [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 * Martin Alonso
2016-09-28 7:40 ` Dan Carpenter
@ 2016-09-28 9:34 ` Greg KH
1 sibling, 0 replies; 11+ messages in thread
From: Greg KH @ 2016-09-28 9:34 UTC (permalink / raw)
To: Martin Alonso; +Cc: joe, forest, pasteka, devel, linux-kernel
On Tue, Sep 27, 2016 at 02:52:49PM -0300, Martin Alonso wrote:
> Change the type and uses of rx_rate.
That's totally vague and doesn't say why this patch is needed at all.
For all I can tell, it looks like you are changing the type for no good
reason...
Please fix this up and resend.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 *
2016-09-28 7:40 ` Dan Carpenter
@ 2016-09-30 18:53 ` Malcolm Priestley
2016-09-30 19:37 ` Dan Carpenter
0 siblings, 1 reply; 11+ messages in thread
From: Malcolm Priestley @ 2016-09-30 18:53 UTC (permalink / raw)
To: Dan Carpenter, Martin Alonso
Cc: pasteka, devel, gregkh, linux-kernel, forest, joe
On 28/09/16 08:40, Dan Carpenter wrote:
> On Tue, Sep 27, 2016 at 02:52:49PM -0300, Martin Alonso wrote:
>> Change the type and uses of rx_rate.
>>
>> Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
>> ---
>> drivers/staging/vt6656/dpc.c | 9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
>> index 655f000..782b7d7 100644
>> --- a/drivers/staging/vt6656/dpc.c
>> +++ b/drivers/staging/vt6656/dpc.c
>> @@ -46,7 +46,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
>> __le64 *tsf_time;
>> u32 frame_size;
>> int ii, r;
>> - u8 *rx_rate, *sq, *sq_3;
>> + u8 rx_rate;
>> + u8 *sq, *sq_3;
>> u32 wbk_status;
>> u8 *skb_data;
>> u16 *pay_load_len;
>> @@ -75,7 +76,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
>>
>> skb_data = (u8 *)skb->data;
>>
>> - rx_rate = skb_data + 5;
>> + rx_rate = *(skb_data + 5);
>
> It occurs to me that we don't check that skb->len is large enough here.
> We just assume it has at least 5 bytes.
>
> TODO: vt6656: verify skb->len before using it.
skb->len is always set to the tail room then trimmed by this function.
Regards
Malcolm
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 *
2016-09-30 18:53 ` Malcolm Priestley
@ 2016-09-30 19:37 ` Dan Carpenter
0 siblings, 0 replies; 11+ messages in thread
From: Dan Carpenter @ 2016-09-30 19:37 UTC (permalink / raw)
To: Malcolm Priestley
Cc: Martin Alonso, pasteka, devel, gregkh, linux-kernel, forest, joe
On Fri, Sep 30, 2016 at 07:53:00PM +0100, Malcolm Priestley wrote:
> On 28/09/16 08:40, Dan Carpenter wrote:
> >On Tue, Sep 27, 2016 at 02:52:49PM -0300, Martin Alonso wrote:
> >>Change the type and uses of rx_rate.
> >>
> >>Signed-off-by: Martin Alonso <martin.alonso@zoho.com>
> >>---
> >> drivers/staging/vt6656/dpc.c | 9 +++++----
> >> 1 file changed, 5 insertions(+), 4 deletions(-)
> >>
> >>diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
> >>index 655f000..782b7d7 100644
> >>--- a/drivers/staging/vt6656/dpc.c
> >>+++ b/drivers/staging/vt6656/dpc.c
> >>@@ -46,7 +46,8 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
> >> __le64 *tsf_time;
> >> u32 frame_size;
> >> int ii, r;
> >>- u8 *rx_rate, *sq, *sq_3;
> >>+ u8 rx_rate;
> >>+ u8 *sq, *sq_3;
> >> u32 wbk_status;
> >> u8 *skb_data;
> >> u16 *pay_load_len;
> >>@@ -75,7 +76,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
> >>
> >> skb_data = (u8 *)skb->data;
> >>
> >>- rx_rate = skb_data + 5;
> >>+ rx_rate = *(skb_data + 5);
> >
> >It occurs to me that we don't check that skb->len is large enough here.
> >We just assume it has at least 5 bytes.
> >
> >TODO: vt6656: verify skb->len before using it.
>
> skb->len is always set to the tail room then trimmed by this function.
>
We call skb_trim() after assuming it's at least 5 bytes so that doesn't
matter for this discussion?
regards,
dan carpenter
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-09-30 19:38 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-26 17:48 [PATCH] staging: vt6656: Add spaces around '+' operator Martin Alonso
2016-09-26 18:02 ` Joe Perches
2016-09-27 16:59 ` Martin Alonso
2016-09-27 17:52 ` [PATCH 1/2] staging: vt6656: Remove unused variable 'rx_sts' Martin Alonso
2016-09-27 17:52 ` [PATCH 2/2] staging: vt6656: Make 'rx_rate' u8 instead of u8 * Martin Alonso
2016-09-28 7:40 ` Dan Carpenter
2016-09-30 18:53 ` Malcolm Priestley
2016-09-30 19:37 ` Dan Carpenter
2016-09-28 9:34 ` Greg KH
2016-09-27 11:10 ` [PATCH] staging: vt6656: Add spaces around '+' operator Greg KH
2016-09-27 11:49 ` Martin Alonso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.