Commit e4e72944 authored Apr 04, 2021 by Fabio Aiuto Committed by Greg Kroah-Hartman Apr 05, 2021

staging: rtl8723bs: fix error prone if conditions in core/rtw_eeprom.c



fix the following post-commit hook checkpatch issues:

CHECK: Using comparison to true is error prone
21: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:38:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
36: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:50:
+		if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
47: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:59:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
60: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:72:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
73: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:83:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
86: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:120:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
93: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:124:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
101: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:129:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
108: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:133:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
121: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:149:
+	if (padapter->bSurpriseRemoved == true)

CHECK: Using comparison to true is error prone
130: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:155:
+	if (padapter->bSurpriseRemoved == true)

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/2ffcefe0b2c44cb5d392c4cd095da0f9b754cdc7.1617545239.git.fabioaiuto83@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 42c8cd68

drivers/staging/rtl8723bs/core/rtw_eeprom.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 count)
		u16 x, mask;
		_func_enter_;

		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		mask = 0x01 << (count - 1);
		@@ -47,7 +47,7 @@ _func_enter_;
		x &= ~_EEDI;
		if (data & mask)
		x \|= _EEDI;
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		rtw_write8(padapter, EE_9346CR, (u8)x);
		@@ -56,7 +56,7 @@ _func_enter_;
		down_clk(padapter, &x);
		mask = mask >> 1;
		} while (mask);
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		x &= ~_EEDI;
		@@ -69,7 +69,7 @@ u16 shift_in_bits(_adapter *padapter)
		{
		u16 x, d = 0, i;
		_func_enter_;
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		x = rtw_read8(padapter, EE_9346CR);
		@@ -80,7 +80,7 @@ _func_enter_;
		for (i = 0; i < 16; i++) {
		d = d << 1;
		up_clk(padapter, &x);
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		x = rtw_read8(padapter, EE_9346CR);
		@@ -117,20 +117,20 @@ void eeprom_clean(_adapter *padapter)
		{
		u16 x;
		_func_enter_;
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		x = rtw_read8(padapter, EE_9346CR);
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		x &= ~(_EECS \| _EEDI);
		rtw_write8(padapter, EE_9346CR, (u8)x);
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		up_clk(padapter, &x);
		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		down_clk(padapter, &x);
		@@ -146,13 +146,13 @@ u16 eeprom_read16(_adapter padapter, u16 reg) /ReadEEprom*/

		_func_enter_;

		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		/* select EEPROM, reset bits, set _EECS*/
		x = rtw_read8(padapter, EE_9346CR);

		if (padapter->bSurpriseRemoved == true)
		if (padapter->bSurpriseRemoved)
		goto out;

		x &= ~(_EEDI \| _EEDO \| _EESK \| _EEM0);