[PATCH 2/2] staging:rtl8188eu Fix coding style issues

[janani-sankarababu]

This patch solves the following warnings
thrown by checkpatch script
WARNING: Comparisons should place the constant
on the right side of the test

Signed-off-by: Janani Sankara Babu 
---
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c 
b/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
index d8d88b5..767928a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
@@ -56,7 +56,7 @@ u8 rtw_do_join(struct adapter *padapter)
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 
("rtw_do_join(): site survey if scanned_queue is empty\n."));
/*  submit site_survey_cmd */
ret = rtw_sitesurvey_cmd(padapter, 
>assoc_ssid, 1, NULL, 0);
-   if (_SUCCESS != ret) {
+   if (ret != _SUCCESS) {
pmlmepriv->to_join = false;
RT_TRACE(_module_rtl871x_ioctl_set_c_, 
_drv_err_, ("rtw_do_join(): site survey return error\n."));
}
@@ -110,7 +110,7 @@ u8 rtw_do_join(struct adapter *padapter)
if (!pmlmepriv->LinkDetectInfo.bBusyTraffic ||
pmlmepriv->to_roaming > 0) {
ret = rtw_sitesurvey_cmd(padapter, 
>assoc_ssid, 1, NULL, 0);
-   if (_SUCCESS != ret) {
+   if (ret != _SUCCESS) {
pmlmepriv->to_join = false;

RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("do_join(): site survey 
return error\n."));
}
@@ -621,7 +621,7 @@ int rtw_set_country(struct adapter *adapter, const char 
*country_code)
 
DBG_88E("%s country_code:%s\n", __func__, country_code);
for (i = 0; i < ARRAY_SIZE(channel_table); i++) {
-   if (0 == strcmp(channel_table[i].name, country_code)) {
+   if (strcmp(channel_table[i].name, country_code) == 0) {
channel_plan = channel_table[i].channel_plan;
break;
}
-- 
1.9.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging:wlan-ng Fix multiple line dereference

[janani-sankarababu]

This patch fixes multiple line dereference Warning
reported by checkpatch script. This is done to
simplify the code and make it more readable.

Signed-off-by: Janani Sankara Babu 
---
 drivers/staging/wlan-ng/hfa384x_usb.c | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c 
b/drivers/staging/wlan-ng/hfa384x_usb.c
index ee5fa86..2746e13 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1345,15 +1345,11 @@ static int hfa384x_usbctlx_complete_sync(struct hfa384x 
*hw,
kfree(ctlx);
} else if (mode == DOWAIT) {
struct usbctlx_cmd_completor completor;
+   struct usbctlx_completor *cmplt;
 
-   result =
-   hfa384x_usbctlx_complete_sync(hw, ctlx,
- init_cmd_completor(,
->
-inbuf.
-cmdresp,
->
-result));
+   cmplt = init_cmd_completor(, >inbuf.cmdresp,
+  >result);
+   result = hfa384x_usbctlx_complete_sync(hw, ctlx, cmplt);
}
 
 done:
-- 
1.9.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH V2 2/2] staging:rtl8188eu:core Fix Avoid CamelCase

[janani-sankarababu]

This patch is created to solve CamelCase issue. The
variables 'IEs' and 'IELength' of struct wlan_bssid_ex
are replaced with 'ies' and 'ie_length' to solve the 
CamelCase issue and these changes are applied to all the 
places where these variables are referenced inside the 
rtl8188eu driver.

Signed-off-by: Janani Sankara Babu 
---
Changelog:
v2 Addressed missing patch sign-off
v1 Solved CamelCase Issue

 drivers/staging/rtl8188eu/core/rtw_ap.c |  75 +-
 drivers/staging/rtl8188eu/core/rtw_cmd.c|  26 +++---
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c  |  20 ++---
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c  |   2 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c   |  66 
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c   | 100 
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c  |  34 
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c|  16 ++--
 drivers/staging/rtl8188eu/include/wlan_bssdef.h |  10 +--
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c  |  12 +--
 10 files changed, 182 insertions(+), 179 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c 
b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 66d4e6c..2cd20f1 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -69,19 +69,22 @@ static void update_BCNTIM(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = >mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = >mlmext_info;
struct wlan_bssid_ex *pnetwork_mlmeext = >network;
-   unsigned char *pie = pnetwork_mlmeext->IEs;
+   //unsigned char *pie = pnetwork_mlmeext->ies;
+   unsigned char *pie = pnetwork_mlmeext->ies;
u8 *p, *dst_ie, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL;
uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
 
/* update TIM IE */
+   //p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, _ielen,
+   //pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);
p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, _ielen,
-   pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_);
+   pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);
if (p && tim_ielen > 0) {
tim_ielen += 2;
premainder_ie = p + tim_ielen;
tim_ie_offset = (int)(p - pie);
-   remainder_ielen = pnetwork_mlmeext->IELength -
+   remainder_ielen = pnetwork_mlmeext->ie_length -
tim_ie_offset - tim_ielen;
/* append TIM IE from dst_ie offset */
dst_ie = p;
@@ -94,7 +97,7 @@ static void update_BCNTIM(struct adapter *padapter)
 
/*  get supported rates len */
p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_,
-  _len, (pnetwork_mlmeext->IELength -
+  _len, (pnetwork_mlmeext->ie_length -
  _BEACON_IE_OFFSET_));
if (p)
offset += tmp_len+2;
@@ -104,7 +107,7 @@ static void update_BCNTIM(struct adapter *padapter)
 
premainder_ie = pie + offset;
 
-   remainder_ielen = pnetwork_mlmeext->IELength -
+   remainder_ielen = pnetwork_mlmeext->ie_length -
offset - tim_ielen;
 
/* append TIM IE from offset */
@@ -148,7 +151,7 @@ static void update_BCNTIM(struct adapter *padapter)
kfree(pbackup_remainder_ie);
}
offset =  (uint)(dst_ie - pie);
-   pnetwork_mlmeext->IELength = offset + remainder_ielen;
+   pnetwork_mlmeext->ie_length = offset + remainder_ielen;
 
set_tx_beacon_cmd(padapter);
 }
@@ -158,13 +161,13 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct 
wlan_bssid_ex *pnetwork,
 {
struct ndis_802_11_var_ie *pIE;
u8 bmatch = false;
-   u8 *pie = pnetwork->IEs;
+   u8 *pie = pnetwork->ies;
u8 *p = NULL, *dst_ie = NULL, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL;
u32 i, offset, ielen = 0, ie_offset, remainder_ielen = 0;
 
-   for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->IELength;) {
-   pIE = (struct ndis_802_11_var_ie *)(pnetwork->IEs + i);
+   for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->ie_length;) 
{
+   pIE = (struct ndis_802_11_var_ie *)(pnetwork->ies + i);
 
if (pIE->ElementID > index) {
break;
@@ -187,7 +190,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct 
wlan_bssid_ex *pnetwork,
 
ie_offset = (int)(p - pie);
 
-   remainder_ielen = pnetwork->IELength - ie_offset - ielen;
+   remainder_ielen = pnetwork->ie_length - ie_offset - ielen;
 
  

[PATCH 2/2] staging:rtl8188eu:core Fix Avoid CamelCase

[janani-sankarababu]

This patch is created to solve CamelCase issue. The
members 'IEs' and 'IELength' of struct wlan_bssid_ex
are modified to 'ies' and 'ielength' to solve CamelCase.
And all the places where these variables are referenced
inside rtl8188eu driver are also changed.
---
 drivers/staging/rtl8188eu/core/rtw_ap.c |  75 +-
 drivers/staging/rtl8188eu/core/rtw_cmd.c|  26 +++---
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c  |  20 ++---
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c  |   2 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c   |  66 
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c   | 100 
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c  |  34 
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c|  16 ++--
 drivers/staging/rtl8188eu/include/wlan_bssdef.h |  10 +--
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c  |  12 +--
 10 files changed, 182 insertions(+), 179 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c 
b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 66d4e6c..2cd20f1 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -69,19 +69,22 @@ static void update_BCNTIM(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = >mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = >mlmext_info;
struct wlan_bssid_ex *pnetwork_mlmeext = >network;
-   unsigned char *pie = pnetwork_mlmeext->IEs;
+   //unsigned char *pie = pnetwork_mlmeext->ies;
+   unsigned char *pie = pnetwork_mlmeext->ies;
u8 *p, *dst_ie, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL;
uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;

/* update TIM IE */
+   //p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, _ielen,
+   //pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);
p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, _ielen,
-   pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_);
+   pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);
if (p && tim_ielen > 0) {
tim_ielen += 2;
premainder_ie = p + tim_ielen;
tim_ie_offset = (int)(p - pie);
-   remainder_ielen = pnetwork_mlmeext->IELength -
+   remainder_ielen = pnetwork_mlmeext->ie_length -
tim_ie_offset - tim_ielen;
/* append TIM IE from dst_ie offset */
dst_ie = p;
@@ -94,7 +97,7 @@ static void update_BCNTIM(struct adapter *padapter)

/*  get supported rates len */
p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_,
-  _len, (pnetwork_mlmeext->IELength -
+  _len, (pnetwork_mlmeext->ie_length -
  _BEACON_IE_OFFSET_));
if (p)
offset += tmp_len+2;
@@ -104,7 +107,7 @@ static void update_BCNTIM(struct adapter *padapter)

premainder_ie = pie + offset;

-   remainder_ielen = pnetwork_mlmeext->IELength -
+   remainder_ielen = pnetwork_mlmeext->ie_length -
offset - tim_ielen;

/* append TIM IE from offset */
@@ -148,7 +151,7 @@ static void update_BCNTIM(struct adapter *padapter)
kfree(pbackup_remainder_ie);
}
offset =  (uint)(dst_ie - pie);
-   pnetwork_mlmeext->IELength = offset + remainder_ielen;
+   pnetwork_mlmeext->ie_length = offset + remainder_ielen;

set_tx_beacon_cmd(padapter);
 }
@@ -158,13 +161,13 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct 
wlan_bssid_ex *pnetwork,
 {
struct ndis_802_11_var_ie *pIE;
u8 bmatch = false;
-   u8 *pie = pnetwork->IEs;
+   u8 *pie = pnetwork->ies;
u8 *p = NULL, *dst_ie = NULL, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL;
u32 i, offset, ielen = 0, ie_offset, remainder_ielen = 0;

-   for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->IELength;) {
-   pIE = (struct ndis_802_11_var_ie *)(pnetwork->IEs + i);
+   for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->ie_length;) 
{
+   pIE = (struct ndis_802_11_var_ie *)(pnetwork->ies + i);

if (pIE->ElementID > index) {
break;
@@ -187,7 +190,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct 
wlan_bssid_ex *pnetwork,

ie_offset = (int)(p - pie);

-   remainder_ielen = pnetwork->IELength - ie_offset - ielen;
+   remainder_ielen = pnetwork->ie_length - ie_offset - ielen;

if (bmatch)
dst_ie = p;
@@ -216,7 +219,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct 
wlan_bssid_ex *pnetwork,
}

[PATCH] staging:rtl8188eu:core Add spaces around

[janani-sankarababu]

This patch is created to solve the coding style issues reported
by the checkpatch script.

Signed-off-by: Janani Sankara Babu 
---
 drivers/staging/rtl8188eu/core/rtw_ap.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c 
b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 647a922..66d4e6c 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -119,7 +119,7 @@ static void update_BCNTIM(struct adapter *padapter)
}
*dst_ie++ = _TIM_IE_;

-   if ((pstapriv->tim_bitmap&0xff00) && (pstapriv->tim_bitmap&0x00fc))
+   if ((pstapriv->tim_bitmap & 0xff00) && (pstapriv->tim_bitmap & 0x00fc))
tim_ielen = 5;
else
tim_ielen = 4;
@@ -129,7 +129,7 @@ static void update_BCNTIM(struct adapter *padapter)
*dst_ie++ = 0;/* DTIM count */
*dst_ie++ = 1;/* DTIM period */

-   if (pstapriv->tim_bitmap(0))/* for bc/mc frames */
+   if (pstapriv->tim_bitmap & BIT(0))/* for bc/mc frames */
*dst_ie++ = BIT(0);/* bitmap ctrl */
else
*dst_ie++ = 0;
@@ -583,7 +583,7 @@ static void update_bmc_sta(struct adapter *padapter)
{
u8 arg = 0;

-   arg = psta->mac_id&0x1f;
+   arg = psta->mac_id & 0x1f;
arg |= BIT(7);
tx_ra_bitmap |= ((raid << 28) & 0xf000);
DBG_88E("update_bmc_sta, mask = 0x%x, arg = 0x%x\n", 
tx_ra_bitmap, arg);
@@ -1043,7 +1043,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 
*pbuf,  int len)
(psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_CCMP))
pht_cap->ampdu_params_info |= 
(IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 << 2));
else
-   pht_cap->ampdu_params_info |= 
(IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
+   pht_cap->ampdu_params_info |= 
(IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00);

/* set  Max Rx AMPDU size  to 64K */
pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR & 
0x03);
@@ -1719,7 +1719,7 @@ int rtw_sta_flush(struct adapter *padapter)

DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));

-   if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
+   if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
return 0;

spin_lock_bh(>asoc_list_lock);
@@ -1754,7 +1754,7 @@ void sta_info_update(struct adapter *padapter, struct 
sta_info *psta)
struct mlme_priv *pmlmepriv = >mlmepriv;

/* update wmm cap. */
-   if (WLAN_STA_WME)
+   if (WLAN_STA_WME & flags)
psta->qos_option = 1;
else
psta->qos_option = 0;
@@ -1763,7 +1763,7 @@ void sta_info_update(struct adapter *padapter, struct 
sta_info *psta)
psta->qos_option = 0;

/* update 802.11n ht cap. */
-   if (WLAN_STA_HT) {
+   if (WLAN_STA_HT & flags) {
psta->htpriv.ht_option = true;
psta->qos_option = 1;
} else {
--
1.9.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] Staging: vc04_services: Fix WARN_ON instead of BUG_ON

[janani-sankarababu]

This patch is to replace the use of BUG_ON macro with WARN_ON
inorder to prevent the crashing of the kernel.

Signed-off-by: Janani Sankara Babu 
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c 
b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..30bc246 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -91,7 +91,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
if (mutex_lock_interruptible(>audio_mutex))
return -EINTR;
 
-   BUG_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK));
+   WARN_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK));
 
if (kcontrol->private_value == PCM_PLAYBACK_VOLUME)
ucontrol->value.integer.value[0] = chip2alsa(chip->volume);
-- 
1.9.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH v2] staging:wlan-ng Correct multiple line dereference

[janani-sankarababu]

This patch fixes the multiple line dereference Warning reported by
checkpath script. This has been made to simplify the code and make
it more readable.

Signed-off-by: Janani Sankara Babu 
---
 drivers/staging/wlan-ng/hfa384x_usb.c | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c 
b/drivers/staging/wlan-ng/hfa384x_usb.c
index ee5fa86..2fc5f3e 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1345,15 +1345,13 @@ static int hfa384x_usbctlx_complete_sync(struct hfa384x 
*hw,
kfree(ctlx);
} else if (mode == DOWAIT) {
struct usbctlx_cmd_completor completor;
+   struct usbctlx_completor *cmplt;
+
+   cmplt = init_cmd_completor(, >inbuf.cmdresp,
+  >result);

-   result =
-   hfa384x_usbctlx_complete_sync(hw, ctlx,
- init_cmd_completor(,
->
-inbuf.
-cmdresp,
->
-result));
+   result = hfa384x_usbctlx_complete_sync(hw, ctlx, cmplt);
}

done:
--
1.9.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] drivers:staging:wlan-ng Correct multiple line dereference

[janani-sankarababu]

This patch fixes multiple line dereference Warning reported by checkpath 
script. This has been made to simplify the code and make it more readable.

Signed-off-by: Janani S 
---
 drivers/staging/wlan-ng/hfa384x_usb.c | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c 
b/drivers/staging/wlan-ng/hfa384x_usb.c
index ee5fa86..2fc5f3e 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1345,15 +1345,13 @@ static int hfa384x_usbctlx_complete_sync(struct hfa384x 
*hw,
kfree(ctlx);
} else if (mode == DOWAIT) {
struct usbctlx_cmd_completor completor;
+   struct usbctlx_completor *cmplt;
+
+   cmplt = init_cmd_completor(, >inbuf.cmdresp,
+  >result);

result =
-   hfa384x_usbctlx_complete_sync(hw, ctlx,
- init_cmd_completor(,
->
-inbuf.
-cmdresp,
->
-result));
+   hfa384x_usbctlx_complete_sync(hw, ctlx, cmplt);
}

done:
--
1.9.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel