diff mbox

staging: rtl8723au: hal: usb_ops_linux: Removed variables that is never used

Message ID 1422717177-5865-1-git-send-email-rickard_strandqvist@spectrumdigital.se (mailing list archive)
State Not Applicable
Headers show

Commit Message

Rickard Strandqvist Jan. 31, 2015, 3:12 p.m. UTC
Variable was assigned a value that was never used.
I have also removed all the code that thereby serves no purpose.

This was found using a static code analysis program called cppcheck

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 drivers/staging/rtl8723au/hal/usb_ops_linux.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Jes Sorensen Feb. 1, 2015, 11:01 p.m. UTC | #1
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:
> Variable was assigned a value that was never used.
> I have also removed all the code that thereby serves no purpose.
>
> This was found using a static code analysis program called cppcheck
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
>  drivers/staging/rtl8723au/hal/usb_ops_linux.c |    9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
> index a6d16ad..4ae0a8a 100644
> --- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
> +++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
> @@ -26,11 +26,10 @@ u8 rtl8723au_read8(struct rtw_adapter *padapter, u16 addr)
>  {
>  	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>  	struct usb_device *udev = pdvobjpriv->pusbdev;
> -	int len;
>  	u8 data;
>  
>  	mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
> -	len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
> +	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>  			      REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>  			      addr, 0, &pdvobjpriv->usb_buf.val8, sizeof(data),
>  			      RTW_USB_CONTROL_MSG_TIMEOUT);
> @@ -45,11 +44,10 @@ u16 rtl8723au_read16(struct rtw_adapter *padapter, u16 addr)
>  {
>  	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>  	struct usb_device *udev = pdvobjpriv->pusbdev;
> -	int len;
>  	u16 data;
>  
>  	mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
> -	len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
> +	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>  			      REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>  			      addr, 0, &pdvobjpriv->usb_buf.val16, sizeof(data),
>  			      RTW_USB_CONTROL_MSG_TIMEOUT);
> @@ -64,11 +62,10 @@ u32 rtl8723au_read32(struct rtw_adapter *padapter, u16 addr)
>  {
>  	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>  	struct usb_device *udev = pdvobjpriv->pusbdev;
> -	int len;
>  	u32 data;
>  
>  	mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
> -	len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
> +	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>  			      REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>  			      addr, 0, &pdvobjpriv->usb_buf.val32, sizeof(data),
>  			      RTW_USB_CONTROL_MSG_TIMEOUT);

Again, fix the formatting if you want to make this change.

NACK

Jes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rickard Strandqvist Feb. 1, 2015, 11:17 p.m. UTC | #2
2015-02-02 0:01 GMT+01:00 Jes Sorensen <Jes.Sorensen@redhat.com>:
> Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:
>> Variable was assigned a value that was never used.
>> I have also removed all the code that thereby serves no purpose.
>>
>> This was found using a static code analysis program called cppcheck
>>
>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
>> ---
>>  drivers/staging/rtl8723au/hal/usb_ops_linux.c |    9 +++------
>>  1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>> index a6d16ad..4ae0a8a 100644
>> --- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>> +++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>> @@ -26,11 +26,10 @@ u8 rtl8723au_read8(struct rtw_adapter *padapter, u16 addr)
>>  {
>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>> -     int len;
>>       u8 data;
>>
>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>                             addr, 0, &pdvobjpriv->usb_buf.val8, sizeof(data),
>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>> @@ -45,11 +44,10 @@ u16 rtl8723au_read16(struct rtw_adapter *padapter, u16 addr)
>>  {
>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>> -     int len;
>>       u16 data;
>>
>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>                             addr, 0, &pdvobjpriv->usb_buf.val16, sizeof(data),
>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>> @@ -64,11 +62,10 @@ u32 rtl8723au_read32(struct rtw_adapter *padapter, u16 addr)
>>  {
>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>> -     int len;
>>       u32 data;
>>
>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>                             addr, 0, &pdvobjpriv->usb_buf.val32, sizeof(data),
>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>
> Again, fix the formatting if you want to make this change.
>
> NACK
>
> Jes


Hi

I am sorry, please ignore this.
I will not send any more patches.

Kind regards
Rickard Strandqvist
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julian Calaby Feb. 1, 2015, 11:28 p.m. UTC | #3
Hi Rickard,

On Mon, Feb 2, 2015 at 10:17 AM, Rickard Strandqvist
<rickard_strandqvist@spectrumdigital.se> wrote:
> 2015-02-02 0:01 GMT+01:00 Jes Sorensen <Jes.Sorensen@redhat.com>:
>> Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:
>>> Variable was assigned a value that was never used.
>>> I have also removed all the code that thereby serves no purpose.
>>>
>>> This was found using a static code analysis program called cppcheck
>>>
>>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
>>> ---
>>>  drivers/staging/rtl8723au/hal/usb_ops_linux.c |    9 +++------
>>>  1 file changed, 3 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>>> index a6d16ad..4ae0a8a 100644
>>> --- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>>> +++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>>> @@ -26,11 +26,10 @@ u8 rtl8723au_read8(struct rtw_adapter *padapter, u16 addr)
>>>  {
>>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>>> -     int len;
>>>       u8 data;
>>>
>>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>>                             addr, 0, &pdvobjpriv->usb_buf.val8, sizeof(data),
>>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>>> @@ -45,11 +44,10 @@ u16 rtl8723au_read16(struct rtw_adapter *padapter, u16 addr)
>>>  {
>>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>>> -     int len;
>>>       u16 data;
>>>
>>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>>                             addr, 0, &pdvobjpriv->usb_buf.val16, sizeof(data),
>>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>>> @@ -64,11 +62,10 @@ u32 rtl8723au_read32(struct rtw_adapter *padapter, u16 addr)
>>>  {
>>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>>> -     int len;
>>>       u32 data;
>>>
>>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>>                             addr, 0, &pdvobjpriv->usb_buf.val32, sizeof(data),
>>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>>
>> Again, fix the formatting if you want to make this change.
>>
>> NACK
>>
>> Jes
>
>
> Hi
>
> I am sorry, please ignore this.
> I will not send any more patches.

The issue isn't you sending patches, the issue is that you don't spend
enough time on them.

As I understand it, the formatting for function calls is that if the
arguments flow onto a new line, they start in the column after the
opening bracket of the function call.

I.e.

do_something(arg, arg, arg,
/* 13 cols */arg, arg, arg);

(Using tabs and spaces instead of the comment of course)

In this case, you're dropping 6 characters from the line with the
function call. You then need to re-flow the arguments to suit.

Thanks,
Jes Sorensen Feb. 1, 2015, 11:36 p.m. UTC | #4
Julian Calaby <julian.calaby@gmail.com> writes:
> Hi Rickard,
>
> On Mon, Feb 2, 2015 at 10:17 AM, Rickard Strandqvist
> <rickard_strandqvist@spectrumdigital.se> wrote:
>> 2015-02-02 0:01 GMT+01:00 Jes Sorensen <Jes.Sorensen@redhat.com>:
>>> Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:
>>>> Variable was assigned a value that was never used.
>>>> I have also removed all the code that thereby serves no purpose.
>>>>
>>>> This was found using a static code analysis program called cppcheck
>>>>
>>>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
>>>> ---
>>>>  drivers/staging/rtl8723au/hal/usb_ops_linux.c |    9 +++------
>>>>  1 file changed, 3 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>>>> index a6d16ad..4ae0a8a 100644
>>>> --- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>>>> +++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
>>>> @@ -26,11 +26,10 @@ u8 rtl8723au_read8(struct rtw_adapter *padapter, u16 addr)
>>>>  {
>>>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>>>> -     int len;
>>>>       u8 data;
>>>>
>>>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>>>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>>>                             addr, 0, &pdvobjpriv->usb_buf.val8, sizeof(data),
>>>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>>>> @@ -45,11 +44,10 @@ u16 rtl8723au_read16(struct rtw_adapter *padapter, u16 addr)
>>>>  {
>>>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>>>> -     int len;
>>>>       u16 data;
>>>>
>>>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>>>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>>>                             addr, 0, &pdvobjpriv->usb_buf.val16, sizeof(data),
>>>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>>>> @@ -64,11 +62,10 @@ u32 rtl8723au_read32(struct rtw_adapter *padapter, u16 addr)
>>>>  {
>>>>       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
>>>>       struct usb_device *udev = pdvobjpriv->pusbdev;
>>>> -     int len;
>>>>       u32 data;
>>>>
>>>>       mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
>>>> -     len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>> +     usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>>>>                             REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
>>>>                             addr, 0, &pdvobjpriv->usb_buf.val32, sizeof(data),
>>>>                             RTW_USB_CONTROL_MSG_TIMEOUT);
>>>
>>> Again, fix the formatting if you want to make this change.
>>>
>>> NACK
>>>
>>> Jes
>>
>>
>> Hi
>>
>> I am sorry, please ignore this.
>> I will not send any more patches.
>
> The issue isn't you sending patches, the issue is that you don't spend
> enough time on them.
>
> As I understand it, the formatting for function calls is that if the
> arguments flow onto a new line, they start in the column after the
> opening bracket of the function call.
>
> I.e.
>
> do_something(arg, arg, arg,
> /* 13 cols */arg, arg, arg);
>
> (Using tabs and spaces instead of the comment of course)
>
> In this case, you're dropping 6 characters from the line with the
> function call. You then need to re-flow the arguments to suit.

This is correct, of all the automated patches that flow in the staging
tree, I'd see these are some of the more useful ones, because they get
rid of unused clutter, making it easier to follow the actual code.

However, breaking coding style using automated tools is just going to
result in someone else having to go back and fix that up in a second
patch. 

As Julian points out, please spend the little extra effort so we get it
right in the first patch.

Cheers,
Jes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
index a6d16ad..4ae0a8a 100644
--- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
@@ -26,11 +26,10 @@  u8 rtl8723au_read8(struct rtw_adapter *padapter, u16 addr)
 {
 	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
 	struct usb_device *udev = pdvobjpriv->pusbdev;
-	int len;
 	u8 data;
 
 	mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
-	len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
 			      REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
 			      addr, 0, &pdvobjpriv->usb_buf.val8, sizeof(data),
 			      RTW_USB_CONTROL_MSG_TIMEOUT);
@@ -45,11 +44,10 @@  u16 rtl8723au_read16(struct rtw_adapter *padapter, u16 addr)
 {
 	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
 	struct usb_device *udev = pdvobjpriv->pusbdev;
-	int len;
 	u16 data;
 
 	mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
-	len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
 			      REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
 			      addr, 0, &pdvobjpriv->usb_buf.val16, sizeof(data),
 			      RTW_USB_CONTROL_MSG_TIMEOUT);
@@ -64,11 +62,10 @@  u32 rtl8723au_read32(struct rtw_adapter *padapter, u16 addr)
 {
 	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
 	struct usb_device *udev = pdvobjpriv->pusbdev;
-	int len;
 	u32 data;
 
 	mutex_lock(&pdvobjpriv->usb_vendor_req_mutex);
-	len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
 			      REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ,
 			      addr, 0, &pdvobjpriv->usb_buf.val32, sizeof(data),
 			      RTW_USB_CONTROL_MSG_TIMEOUT);