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

staging: rtl8712: Fix unbalanced braces around else statement

Fix checkpath-reported unbalanced braces in the following areas

221: FILE: drivers/staging/rtl8712/hal_init.c:221:
392: FILE: drivers/staging/rtl8712/os_intfs.c:392:
363: FILE: drivers/staging/rtl8712/rtl8712_cmd.c:363:
889: FILE: drivers/staging/rtl8712/rtl8712_recv.c:889:
902: FILE: drivers/staging/rtl8712/rtl871x_cmd.c:902:
84: FILE: drivers/staging/rtl8712/rtl871x_ioctl_set.c:84:
580: FILE: drivers/staging/rtl8712/rtl871x_mlme.c:580:
593: FILE: drivers/staging/rtl8712/usb_intf.c:593:

Signed-off-by: Liam Ryan <liamryandev@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Liam Ryan and committed by
Greg Kroah-Hartman
a7e58591 2af630f0

+16 -14
+2 -2
drivers/staging/rtl8712/hal_init.c
··· 216 216 emem_sz = fwhdr.img_SRAM_size; 217 217 do { 218 218 memset(ptx_desc, 0, TXDESC_SIZE); 219 - if (emem_sz > MAX_DUMP_FWSZ) /* max=48k */ 219 + if (emem_sz > MAX_DUMP_FWSZ) { /* max=48k */ 220 220 dump_emem_sz = MAX_DUMP_FWSZ; 221 - else { 221 + } else { 222 222 dump_emem_sz = emem_sz; 223 223 ptx_desc->txdw0 |= cpu_to_le32(BIT(28)); 224 224 }
+2 -2
drivers/staging/rtl8712/os_intfs.c
··· 385 385 padapter->bup = true; 386 386 if (rtl871x_hal_init(padapter) != _SUCCESS) 387 387 goto netdev_open_error; 388 - if (!r8712_initmac) 388 + if (!r8712_initmac) { 389 389 /* Use the mac address stored in the Efuse */ 390 390 memcpy(pnetdev->dev_addr, 391 391 padapter->eeprompriv.mac_addr, ETH_ALEN); 392 - else { 392 + } else { 393 393 /* We have to inform f/w to use user-supplied MAC 394 394 * address. 395 395 */
+2 -2
drivers/staging/rtl8712/rtl8712_cmd.c
··· 356 356 if ((wr_sz % 64) == 0) 357 357 blnPending = 1; 358 358 } 359 - if (blnPending) /* 32 bytes for TX Desc - 8 offset */ 359 + if (blnPending) { /* 32 bytes for TX Desc - 8 offset */ 360 360 pdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE + 361 361 OFFSET_SZ + 8) << OFFSET_SHT) & 362 362 0x00ff0000); 363 - else { 363 + } else { 364 364 pdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE + 365 365 OFFSET_SZ) << 366 366 OFFSET_SHT) &
+2 -2
drivers/staging/rtl8712/rtl8712_recv.c
··· 883 883 * from 0~100. It is assigned to the BSS List in 884 884 * GetValueFromBeaconOrProbeRsp(). 885 885 */ 886 - if (bcck_rate) 886 + if (bcck_rate) { 887 887 prframe->u.hdr.attrib.signal_strength = 888 888 (u8)r8712_signal_scale_mapping(pwdb_all); 889 - else { 889 + } else { 890 890 if (rf_rx_num != 0) 891 891 prframe->u.hdr.attrib.signal_strength = 892 892 (u8)(r8712_signal_scale_mapping(total_rssi /=
+2 -1
drivers/staging/rtl8712/rtl871x_cmd.c
··· 899 899 if (!pwlan) 900 900 goto createbss_cmd_fail; 901 901 pwlan->last_scanned = jiffies; 902 - } else 902 + } else { 903 903 list_add_tail(&(pwlan->list), 904 904 &pmlmepriv->scanned_queue.queue); 905 + } 905 906 pnetwork->Length = r8712_get_wlan_bssid_ex_sz(pnetwork); 906 907 memcpy(&(pwlan->network), pnetwork, pnetwork->Length); 907 908 pwlan->fixed = true;
+2 -2
drivers/staging/rtl8712/rtl871x_ioctl_set.c
··· 78 78 int ret; 79 79 80 80 ret = r8712_select_and_join_from_scan(pmlmepriv); 81 - if (ret == _SUCCESS) 81 + if (ret == _SUCCESS) { 82 82 mod_timer(&pmlmepriv->assoc_timer, 83 83 jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT)); 84 - else { 84 + } else { 85 85 if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { 86 86 /* submit r8712_createbss_cmd to change to an 87 87 * ADHOC_MASTER pmlmepriv->lock has been
+2 -2
drivers/staging/rtl8712/rtl871x_mlme.c
··· 574 574 set_fwstate(pmlmepriv, _FW_UNDER_LINKING); 575 575 576 576 if (r8712_select_and_join_from_scan(pmlmepriv) 577 - == _SUCCESS) 577 + == _SUCCESS) { 578 578 mod_timer(&pmlmepriv->assoc_timer, jiffies + 579 579 msecs_to_jiffies(MAX_JOIN_TIMEOUT)); 580 - else { 580 + } else { 581 581 struct wlan_bssid_ex *pdev_network = 582 582 &(adapter->registrypriv.dev_network); 583 583 u8 *pibss =
+2 -1
drivers/staging/rtl8712/usb_intf.c
··· 590 590 mac[0] &= 0xFE; 591 591 dev_info(&udev->dev, 592 592 "r8712u: MAC Address from user = %pM\n", mac); 593 - } else 593 + } else { 594 594 dev_info(&udev->dev, 595 595 "r8712u: MAC Address from efuse = %pM\n", mac); 596 + } 596 597 ether_addr_copy(pnetdev->dev_addr, mac); 597 598 } 598 599 /* step 6. Load the firmware asynchronously */