Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8712: style fix over 80 characters warnings

This patch fixes various coding style issues in the rtl8712 module as
noted by checkpatch.pl by reducing the characters per line to under
80.

It fixes the following checkpatch.pl warning:

WARNING: line over 80 characters

Signed-off-by: Martin Homuth <martin@martinhomuth.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Martin Homuth and committed by
Greg Kroah-Hartman
3be4fdf6 298291bb

+22 -13
+4 -2
drivers/staging/rtl8712/ieee80211.c
··· 169 169 int sz = 0, rate_len; 170 170 struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; 171 171 u8 *ie = pdev_network->IEs; 172 + u16 beaconPeriod = (u16)pdev_network->Configuration.BeaconPeriod; 172 173 173 174 /*timestamp will be inserted by hardware*/ 174 175 sz += 8; 175 176 ie += sz; 176 177 /*beacon interval : 2bytes*/ 177 - *(__le16 *)ie = cpu_to_le16((u16)pdev_network->Configuration.BeaconPeriod); 178 + *(__le16 *)ie = cpu_to_le16(beaconPeriod); 178 179 sz += 2; 179 180 ie += 2; 180 181 /*capability info*/ ··· 222 221 pbuf = r8712_get_ie(pbuf, _WPA_IE_ID_, &len, limit); 223 222 if (pbuf) { 224 223 /*check if oui matches...*/ 225 - if (memcmp((pbuf + 2), wpa_oui_type, sizeof(wpa_oui_type))) 224 + if (memcmp((pbuf + 2), wpa_oui_type, 225 + sizeof(wpa_oui_type))) 226 226 goto check_next_ie; 227 227 /*check version...*/ 228 228 memcpy((u8 *)&val16, (pbuf + 6), sizeof(val16));
+4 -1
drivers/staging/rtl8712/os_intfs.c
··· 238 238 239 239 void r8712_stop_drv_threads(struct _adapter *padapter) 240 240 { 241 + struct completion *completion = 242 + &padapter->cmdpriv.terminate_cmdthread_comp; 243 + 241 244 /*Below is to terminate r8712_cmd_thread & event_thread...*/ 242 245 complete(&padapter->cmdpriv.cmd_queue_comp); 243 246 if (padapter->cmdThread) 244 - wait_for_completion_interruptible(&padapter->cmdpriv.terminate_cmdthread_comp); 247 + wait_for_completion_interruptible(completion); 245 248 padapter->cmdpriv.cmd_seq = 1; 246 249 } 247 250
+10 -8
drivers/staging/rtl8712/rtl8712_cmd.c
··· 321 321 void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd); 322 322 struct _adapter *padapter = context; 323 323 struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); 324 + struct completion *cmd_queue_comp = 325 + &pcmdpriv->cmd_queue_comp; 326 + struct mutex *pwctrl_lock = &padapter->pwrctrlpriv.mutex_lock; 324 327 325 328 allow_signal(SIGTERM); 326 329 while (1) { 327 - if (wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp)) 330 + if (wait_for_completion_interruptible(cmd_queue_comp)) 328 331 break; 329 332 if (padapter->bDriverStopped || padapter->bSurpriseRemoved) 330 333 break; ··· 346 343 if (pcmd) { /* if pcmd != NULL, cmd will be handled by f/w */ 347 344 struct dvobj_priv *pdvobj = &padapter->dvobjpriv; 348 345 u8 blnPending = 0; 346 + u16 cmdcode = pcmd->cmdcode; 349 347 350 348 pcmdpriv->cmd_issued_cnt++; 351 349 cmdsz = round_up(pcmd->cmdsz, 8); ··· 391 387 r8712_write_mem(padapter, RTL8712_DMA_H2CCMD, wr_sz, 392 388 (u8 *)pdesc); 393 389 pcmdpriv->cmd_seq++; 394 - if (pcmd->cmdcode == GEN_CMD_CODE(_CreateBss)) { 390 + if (cmdcode == GEN_CMD_CODE(_CreateBss)) { 395 391 pcmd->res = H2C_SUCCESS; 396 - pcmd_callback = cmd_callback[pcmd-> 397 - cmdcode].callback; 392 + pcmd_callback = cmd_callback[cmdcode].callback; 398 393 if (pcmd_callback) 399 394 pcmd_callback(padapter, pcmd); 400 395 continue; 401 396 } 402 - if (pcmd->cmdcode == GEN_CMD_CODE(_SetPwrMode)) { 397 + if (cmdcode == GEN_CMD_CODE(_SetPwrMode)) { 403 398 if (padapter->pwrctrlpriv.bSleep) { 404 - mutex_lock(&padapter-> 405 - pwrctrlpriv.mutex_lock); 399 + mutex_lock(pwctrl_lock); 406 400 r8712_set_rpwm(padapter, PS_STATE_S2); 407 - mutex_unlock(&padapter->pwrctrlpriv.mutex_lock); 401 + mutex_unlock(pwctrl_lock); 408 402 } 409 403 } 410 404 r8712_free_cmd_obj(pcmd);
+2 -1
drivers/staging/rtl8712/rtl8712_xmit.c
··· 573 573 } 574 574 } else if (pxmitframe->frame_tag == MGNT_FRAMETAG) { 575 575 /* offset 4 */ 576 - ptxdesc->txdw1 |= cpu_to_le32((0x05) & 0x1f);/*CAM_ID(MAC_ID), default=5;*/ 576 + /* CAM_ID(MAC_ID), default=5; */ 577 + ptxdesc->txdw1 |= cpu_to_le32((0x05) & 0x1f); 577 578 qsel = (uint)(pattrib->qsel & 0x0000001f); 578 579 ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00); 579 580 ptxdesc->txdw1 |= cpu_to_le32(BIT(16));/* Non-QoS */
+2 -1
drivers/staging/rtl8712/rtl871x_mlme.h
··· 55 55 * single-tone 56 56 */ 57 57 #define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000 /* pending in cont, tx 58 - * background due to out of skb 58 + * background due 59 + * to out of skb 59 60 */ 60 61 #define WIFI_MP_CTX_CCK_HW 0x00100000 /* in continuous tx*/ 61 62 #define WIFI_MP_CTX_CCK_CS 0x00200000 /* in cont, tx with carrier