Re: [PATCH 01/19] staging: rtl8188eu: cleanup inconsistent indenting
On Sun, Sep 30, 2018 at 01:30:11PM -0700, Joe Perches wrote: > On Sun, 2018-09-30 at 21:52 +0200, Michael Straube wrote: > > Cleanup all inconsistent indenting reported by smatch. > > There are also some others like: > > drivers/staging/rtl8188eu/core/rtw_mlme.c:1752: WARNING:SUSPECT_CODE_INDENT: > suspect code indent for conditional statements (8, 24) > 1750: if ((ndisauthmode == Ndis802_11AuthModeWPA) || > 1751: (ndisauthmode == Ndis802_11AuthModeWPAPSK)) > 1752: authmode = _WPA_IE_ID_; > > Perhaps smatch can be enhanced to find those too. > Style issues are not something I want to get into... I had hoped that this test would find bugs, because stuff like this looks so suspicious: diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c index 20f34d25c369..5c4ff81987bd 100644 --- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c @@ -246,7 +246,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) wireless_mode = pregistrypriv->wireless_mode; } - rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode); + rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode); rateLen = rtw_get_rateset_len(pdev_network->SupportedRates); But I've never found even one bug with the inconsistent indenting check. The other related test about missing curly braces is pretty useful though. regards, dan carpenter
Re: [PATCH 01/19] staging: rtl8188eu: cleanup inconsistent indenting
On Sun, Sep 30, 2018 at 01:30:11PM -0700, Joe Perches wrote: > On Sun, 2018-09-30 at 21:52 +0200, Michael Straube wrote: > > Cleanup all inconsistent indenting reported by smatch. > > There are also some others like: > > drivers/staging/rtl8188eu/core/rtw_mlme.c:1752: WARNING:SUSPECT_CODE_INDENT: > suspect code indent for conditional statements (8, 24) > 1750: if ((ndisauthmode == Ndis802_11AuthModeWPA) || > 1751: (ndisauthmode == Ndis802_11AuthModeWPAPSK)) > 1752: authmode = _WPA_IE_ID_; > > Perhaps smatch can be enhanced to find those too. > Style issues are not something I want to get into... I had hoped that this test would find bugs, because stuff like this looks so suspicious: diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c index 20f34d25c369..5c4ff81987bd 100644 --- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c @@ -246,7 +246,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) wireless_mode = pregistrypriv->wireless_mode; } - rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode); + rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode); rateLen = rtw_get_rateset_len(pdev_network->SupportedRates); But I've never found even one bug with the inconsistent indenting check. The other related test about missing curly braces is pretty useful though. regards, dan carpenter
Re: [PATCH 01/19] staging: rtl8188eu: cleanup inconsistent indenting
On Sun, 2018-09-30 at 21:52 +0200, Michael Straube wrote: > Cleanup all inconsistent indenting reported by smatch. There are also some others like: drivers/staging/rtl8188eu/core/rtw_mlme.c:1752: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 24) 1750: if ((ndisauthmode == Ndis802_11AuthModeWPA) || 1751: (ndisauthmode == Ndis802_11AuthModeWPAPSK)) 1752: authmode = _WPA_IE_ID_; Perhaps smatch can be enhanced to find those too.
Re: [PATCH 01/19] staging: rtl8188eu: cleanup inconsistent indenting
On Sun, 2018-09-30 at 21:52 +0200, Michael Straube wrote: > Cleanup all inconsistent indenting reported by smatch. There are also some others like: drivers/staging/rtl8188eu/core/rtw_mlme.c:1752: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 24) 1750: if ((ndisauthmode == Ndis802_11AuthModeWPA) || 1751: (ndisauthmode == Ndis802_11AuthModeWPAPSK)) 1752: authmode = _WPA_IE_ID_; Perhaps smatch can be enhanced to find those too.
[PATCH 01/19] staging: rtl8188eu: cleanup inconsistent indenting
Cleanup all inconsistent indenting reported by smatch.
Signed-off-by: Michael Straube
---
drivers/staging/rtl8188eu/core/rtw_efuse.c| 2 +-
.../staging/rtl8188eu/core/rtw_ieee80211.c| 2 +-
drivers/staging/rtl8188eu/core/rtw_led.c | 4 ++--
drivers/staging/rtl8188eu/core/rtw_mlme.c | 16 +++
drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_security.c | 5 ++---
.../rtl8188eu/hal/hal8188e_rate_adaptive.c| 18 +
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 2 +-
drivers/staging/rtl8188eu/hal/usb_halinit.c | 20 +--
.../staging/rtl8188eu/os_dep/ioctl_linux.c| 10 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 +-
12 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c
b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 4988d97ca0d1..cb6d1fb776da 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -37,7 +37,7 @@ void efuse_power_switch(struct adapter *pAdapter, u8 write,
u8 pwrstate)
tmpv16 = usb_read16(pAdapter, REG_SYS_ISO_CTRL);
if (!(tmpv16 & PWC_EV12V)) {
tmpv16 |= PWC_EV12V;
-usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpv16);
+ usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpv16);
}
/* Reset: 0xh[28], default valid */
tmpv16 = usb_read16(pAdapter, REG_SYS_FUNC_EN);
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 20f34d25c369..5c4ff81987bd 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -246,7 +246,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
wireless_mode = pregistrypriv->wireless_mode;
}
- rtw_set_supported_rate(pdev_network->SupportedRates,
wireless_mode);
+ rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
rateLen = rtw_get_rateset_len(pdev_network->SupportedRates);
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c
b/drivers/staging/rtl8188eu/core/rtw_led.c
index 98106e77a9f6..a2e7789aecbd 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -357,7 +357,7 @@ static void SwLedControlMode1(struct adapter *padapter,
enum LED_CTL_MODE LedAct
}
if (pLed->bLedLinkBlinkInProgress) {
del_timer_sync(>BlinkTimer);
-pLed->bLedLinkBlinkInProgress = false;
+ pLed->bLedLinkBlinkInProgress = false;
}
if (pLed->bLedBlinkInProgress) {
del_timer_sync(>BlinkTimer);
@@ -383,7 +383,7 @@ static void SwLedControlMode1(struct adapter *padapter,
enum LED_CTL_MODE LedAct
}
if (pLed->bLedLinkBlinkInProgress) {
del_timer_sync(>BlinkTimer);
-pLed->bLedLinkBlinkInProgress = false;
+ pLed->bLedLinkBlinkInProgress = false;
}
if (pLed->bLedBlinkInProgress) {
del_timer_sync(>BlinkTimer);
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c
b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index d18d34313a9e..858b597cb506 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -305,7 +305,7 @@ static int is_same_ess(struct wlan_bssid_ex *a, struct
wlan_bssid_ex *b)
int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
{
-u16 s_cap, d_cap;
+ u16 s_cap, d_cap;
__le16 le_scap, le_dcap;
memcpy((u8 *)_scap, rtw_get_capability_from_ie(src->ies), 2);
@@ -842,7 +842,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct
adapter *padapter, str
if (psta) { /* update ptarget_sta */
DBG_88E("%s\n", __func__);
psta->aid = pnetwork->join_res;
- psta->mac_id = 0;
+ psta->mac_id = 0;
/* sta mode */
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
/* security related */
@@ -1038,12 +1038,12 @@ void rtw_joinbss_event_prehandle(struct adapter
*adapter, u8 *pbuf)
}
/* s4. indicate connect */
- if (check_fwstate(pmlmepriv,
WIFI_STATION_STATE) == true) {
- rtw_indicate_connect(adapter);
- } else {
- /* adhoc mode will rtw_indicate_connect
when rtw_stassoc_event_callback */
-
[PATCH 01/19] staging: rtl8188eu: cleanup inconsistent indenting
Cleanup all inconsistent indenting reported by smatch.
Signed-off-by: Michael Straube
---
drivers/staging/rtl8188eu/core/rtw_efuse.c| 2 +-
.../staging/rtl8188eu/core/rtw_ieee80211.c| 2 +-
drivers/staging/rtl8188eu/core/rtw_led.c | 4 ++--
drivers/staging/rtl8188eu/core/rtw_mlme.c | 16 +++
drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_security.c | 5 ++---
.../rtl8188eu/hal/hal8188e_rate_adaptive.c| 18 +
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 2 +-
drivers/staging/rtl8188eu/hal/usb_halinit.c | 20 +--
.../staging/rtl8188eu/os_dep/ioctl_linux.c| 10 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 +-
12 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c
b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 4988d97ca0d1..cb6d1fb776da 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -37,7 +37,7 @@ void efuse_power_switch(struct adapter *pAdapter, u8 write,
u8 pwrstate)
tmpv16 = usb_read16(pAdapter, REG_SYS_ISO_CTRL);
if (!(tmpv16 & PWC_EV12V)) {
tmpv16 |= PWC_EV12V;
-usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpv16);
+ usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpv16);
}
/* Reset: 0xh[28], default valid */
tmpv16 = usb_read16(pAdapter, REG_SYS_FUNC_EN);
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 20f34d25c369..5c4ff81987bd 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -246,7 +246,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
wireless_mode = pregistrypriv->wireless_mode;
}
- rtw_set_supported_rate(pdev_network->SupportedRates,
wireless_mode);
+ rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
rateLen = rtw_get_rateset_len(pdev_network->SupportedRates);
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c
b/drivers/staging/rtl8188eu/core/rtw_led.c
index 98106e77a9f6..a2e7789aecbd 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -357,7 +357,7 @@ static void SwLedControlMode1(struct adapter *padapter,
enum LED_CTL_MODE LedAct
}
if (pLed->bLedLinkBlinkInProgress) {
del_timer_sync(>BlinkTimer);
-pLed->bLedLinkBlinkInProgress = false;
+ pLed->bLedLinkBlinkInProgress = false;
}
if (pLed->bLedBlinkInProgress) {
del_timer_sync(>BlinkTimer);
@@ -383,7 +383,7 @@ static void SwLedControlMode1(struct adapter *padapter,
enum LED_CTL_MODE LedAct
}
if (pLed->bLedLinkBlinkInProgress) {
del_timer_sync(>BlinkTimer);
-pLed->bLedLinkBlinkInProgress = false;
+ pLed->bLedLinkBlinkInProgress = false;
}
if (pLed->bLedBlinkInProgress) {
del_timer_sync(>BlinkTimer);
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c
b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index d18d34313a9e..858b597cb506 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -305,7 +305,7 @@ static int is_same_ess(struct wlan_bssid_ex *a, struct
wlan_bssid_ex *b)
int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
{
-u16 s_cap, d_cap;
+ u16 s_cap, d_cap;
__le16 le_scap, le_dcap;
memcpy((u8 *)_scap, rtw_get_capability_from_ie(src->ies), 2);
@@ -842,7 +842,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct
adapter *padapter, str
if (psta) { /* update ptarget_sta */
DBG_88E("%s\n", __func__);
psta->aid = pnetwork->join_res;
- psta->mac_id = 0;
+ psta->mac_id = 0;
/* sta mode */
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
/* security related */
@@ -1038,12 +1038,12 @@ void rtw_joinbss_event_prehandle(struct adapter
*adapter, u8 *pbuf)
}
/* s4. indicate connect */
- if (check_fwstate(pmlmepriv,
WIFI_STATION_STATE) == true) {
- rtw_indicate_connect(adapter);
- } else {
- /* adhoc mode will rtw_indicate_connect
when rtw_stassoc_event_callback */
-
