[PATCH] staging: rtl8723bs: remove redundant comparisons of unsigned ints with >= 0

[PATCH] staging: rtl8723bs: remove redundant comparisons of unsigned ints with >= 0

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

The comparison of mode >= 0 is redundant as mode is a u32 and this
is always true.  Remove this redundant code.

Detected with CoverityScan ("Unsigned compared against 0")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/staging/rtl8723bs/core/rtw_debug.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c
index 51cef55d3f76..fc6b94d59c37 100644
--- a/drivers/staging/rtl8723bs/core/rtw_debug.c
+++ b/drivers/staging/rtl8723bs/core/rtw_debug.c
@@ -1031,7 +1031,7 @@ ssize_t proc_set_ht_enable(struct file *file, const char __user *buffer, size_t
 	if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
 		sscanf(tmp, "%d ", &mode);
 
-		if (pregpriv && mode >= 0 && mode < 2) {
+		if (pregpriv && mode < 2) {
 			pregpriv->ht_enable = mode;
 			printk("ht_enable =%d\n", pregpriv->ht_enable);
 		}
@@ -1150,7 +1150,7 @@ ssize_t proc_set_rx_ampdu(struct file *file, const char __user *buffer, size_t c
 
 		sscanf(tmp, "%d ", &mode);
 
-		if (pregpriv && mode >= 0 && mode < 2) {
+		if (pregpriv && mode < 2) {
 			pmlmeinfo->bAcceptAddbaReq = mode;
 			DBG_871X("pmlmeinfo->bAcceptAddbaReq =%d\n", pmlmeinfo->bAcceptAddbaReq);
 			if (mode = 0) {
@@ -1191,7 +1191,7 @@ ssize_t proc_set_en_fwps(struct file *file, const char __user *buffer, size_t co
 	if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
 		sscanf(tmp, "%d ", &mode);
 
-		if (pregpriv && mode >= 0 && mode < 2) {
+		if (pregpriv && mode < 2) {
 			pregpriv->check_fw_ps = mode;
 			DBG_871X("pregpriv->check_fw_ps =%d\n", pregpriv->check_fw_ps);
 		}
-- 
2.11.0

Re: [PATCH] staging: rtl8723bs: remove redundant comparisons of unsigned ints with >= 0

[Hans de Goede]

Hi,

On 13-04-17 16:13, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The comparison of mode >= 0 is redundant as mode is a u32 and this
> is always true.  Remove this redundant code.
>
> Detected with CoverityScan ("Unsigned compared against 0")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
>  drivers/staging/rtl8723bs/core/rtw_debug.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c
> index 51cef55d3f76..fc6b94d59c37 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_debug.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_debug.c
> @@ -1031,7 +1031,7 @@ ssize_t proc_set_ht_enable(struct file *file, const char __user *buffer, size_t
>  	if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
>  		sscanf(tmp, "%d ", &mode);
>
> -		if (pregpriv && mode >= 0 && mode < 2) {
> +		if (pregpriv && mode < 2) {
>  			pregpriv->ht_enable = mode;
>  			printk("ht_enable =%d\n", pregpriv->ht_enable);
>  		}
> @@ -1150,7 +1150,7 @@ ssize_t proc_set_rx_ampdu(struct file *file, const char __user *buffer, size_t c
>
>  		sscanf(tmp, "%d ", &mode);
>
> -		if (pregpriv && mode >= 0 && mode < 2) {
> +		if (pregpriv && mode < 2) {
>  			pmlmeinfo->bAcceptAddbaReq = mode;
>  			DBG_871X("pmlmeinfo->bAcceptAddbaReq =%d\n", pmlmeinfo->bAcceptAddbaReq);
>  			if (mode = 0) {
> @@ -1191,7 +1191,7 @@ ssize_t proc_set_en_fwps(struct file *file, const char __user *buffer, size_t co
>  	if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
>  		sscanf(tmp, "%d ", &mode);
>
> -		if (pregpriv && mode >= 0 && mode < 2) {
> +		if (pregpriv && mode < 2) {
>  			pregpriv->check_fw_ps = mode;
>  			DBG_871X("pregpriv->check_fw_ps =%d\n", pregpriv->check_fw_ps);
>  		}
>

[PATCH] staging: rtl8723bs: remove redundant assignment to rtStatus

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

Variable rtStatus is initialized with a value that is never read
and later it is reassigned a new value.  Hence the initialization
is redundant and can be removed.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 21f2365fa627..bda19769c37f 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -352,7 +352,7 @@ void rtl8723b_FirmwareSelfReset(struct adapter *padapter)
 /*  */
 s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool  bUsedWoWLANFw)
 {
-	s32 rtStatus = _SUCCESS;
+	s32 rtStatus;
 	u8 write_fw = 0;
 	unsigned long fwdl_start_time;
 	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-- 
2.20.1

Re: [PATCH] staging: rtl8723bs: remove redundant assignment to rtStatus

[Colin Ian King]

On 17/06/2019 13:47, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Variable rtStatus is initialized with a value that is never read
> and later it is reassigned a new value.  Hence the initialization
> is redundant and can be removed.
> 
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> index 21f2365fa627..bda19769c37f 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> @@ -352,7 +352,7 @@ void rtl8723b_FirmwareSelfReset(struct adapter *padapter)
>  /*  */
>  s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool  bUsedWoWLANFw)
>  {
> -	s32 rtStatus = _SUCCESS;
> +	s32 rtStatus;
>  	u8 write_fw = 0;
>  	unsigned long fwdl_start_time;
>  	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
> 

Actually, ignore this, the driver has lots more of these that need
cleaning up, I'll send a V2 with all the fixups later.

Colin

[PATCH] staging: rtl8723bs: remove redundant assignment to variable ret

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

The variable ret is being assigned an error return value that is never
read, the control passes to a return statement and ret is never referenced.
Remove the redundant assignment. Also remove an empty line.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/staging/rtl8723bs/os_dep/osdep_service.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
index 6d443197a0cf..f61ad9200960 100644
--- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
@@ -146,10 +146,8 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)
 	rereg_priv->old_pnetdev = cur_pnetdev;
 
 	pnetdev = rtw_init_netdev(padapter);
-	if (!pnetdev)  {
-		ret = -1;
+	if (!pnetdev)
 		goto error;
-	}
 
 	SET_NETDEV_DEV(pnetdev, dvobj_to_dev(adapter_to_dvobj(padapter)));
 
@@ -170,9 +168,7 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)
 	return 0;
 
 error:
-
 	return -1;
-
 }
 
 void rtw_buf_free(u8 **buf, u32 *buf_len)
-- 
2.27.0