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

rtlwifi: Fix all blank line irregularities in main code files

The types of problems fixed are as follows:

WARNING: Missing a blank line after declarations
CHECK: Please use a blank line after function/struct/union/enum declarations
CHECK: Please don't use multiple blank lines

There are no code changes.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Larry Finger and committed by
Kalle Valo
b16abaaf 93665097

+24 -6
+5 -2
drivers/net/wireless/realtek/rtlwifi/base.c
··· 430 430 SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr); 431 431 } else { 432 432 u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 }; 433 + 433 434 get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1); 434 435 SET_IEEE80211_PERM_ADDR(hw, rtlmac1); 435 436 } ··· 460 459 (void *)rtl_fwevt_wq_callback); 461 460 INIT_DELAYED_WORK(&rtlpriv->works.c2hcmd_wq, 462 461 (void *)rtl_c2hcmd_wq_callback); 463 - 464 462 } 465 463 466 464 void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq) ··· 618 618 u8 rate_flag = info->control.rates[0].flags; 619 619 u8 sgi_40 = 0, sgi_20 = 0, bw_40 = 0; 620 620 u8 sgi_80 = 0, bw_80 = 0; 621 + 621 622 tcb_desc->use_shortgi = false; 622 623 623 624 if (sta == NULL) ··· 1851 1850 1852 1851 return 0; 1853 1852 } 1853 + 1854 1854 int rtl_tx_agg_oper(struct ieee80211_hw *hw, 1855 1855 struct ieee80211_sta *sta, u16 tid) 1856 1856 { ··· 2075 2073 * busytraffic we don't change channel 2076 2074 */ 2077 2075 if (mac->link_state >= MAC80211_LINKED) { 2078 - 2079 2076 /* (1) get aver_rx_cnt_inperiod & aver_tx_cnt_inperiod */ 2080 2077 for (idx = 0; idx <= 2; idx++) { 2081 2078 rtlpriv->link_info.num_rx_in4period[idx] = ··· 2234 2233 mod_timer(&rtlpriv->works.watchdog_timer, 2235 2234 jiffies + MSECS(RTL_WATCH_DOG_TIME)); 2236 2235 } 2236 + 2237 2237 void rtl_fwevt_wq_callback(void *data) 2238 2238 { 2239 2239 struct rtl_works *rtlworks = ··· 2386 2384 2387 2385 rtlpriv->cfg->ops->dualmac_easy_concurrent(hw); 2388 2386 } 2387 + 2389 2388 /********************************************************* 2390 2389 * 2391 2390 * frame process functions
+8
drivers/net/wireless/realtek/rtlwifi/core.c
··· 188 188 struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); 189 189 struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); 190 190 struct rtl_tcb_desc tcb_desc; 191 + 191 192 memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc)); 192 193 193 194 if (unlikely(is_hal_stop(rtlhal) || ppsc->rfpwr_state != ERFON)) ··· 347 346 348 347 mutex_unlock(&rtlpriv->locks.conf_mutex); 349 348 } 349 + 350 350 static int rtl_op_change_interface(struct ieee80211_hw *hw, 351 351 struct ieee80211_vif *vif, 352 352 enum nl80211_iftype new_type, bool p2p) 353 353 { 354 354 struct rtl_priv *rtlpriv = rtl_priv(hw); 355 355 int ret; 356 + 356 357 rtl_op_remove_interface(hw, vif); 357 358 358 359 vif->type = new_type; ··· 884 881 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, 885 882 (u8 *)(&mac->rx_conf)); 886 883 } 884 + 887 885 static int rtl_op_sta_add(struct ieee80211_hw *hw, 888 886 struct ieee80211_vif *vif, 889 887 struct ieee80211_sta *sta) ··· 937 933 { 938 934 struct rtl_priv *rtlpriv = rtl_priv(hw); 939 935 struct rtl_sta_info *sta_entry; 936 + 940 937 if (sta) { 941 938 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG, 942 939 "Remove sta addr is %pM\n", sta->addr); ··· 950 945 } 951 946 return 0; 952 947 } 948 + 953 949 static int _rtl_get_hal_qnum(u16 queue) 954 950 { 955 951 int qnum; ··· 1072 1066 /*TODO: reference to enum ieee80211_bss_change */ 1073 1067 if (changed & BSS_CHANGED_ASSOC) { 1074 1068 u8 mstatus; 1069 + 1075 1070 if (bss_conf->assoc) { 1076 1071 struct ieee80211_sta *sta = NULL; 1077 1072 u8 keep_alive = 10; ··· 1301 1294 * set in sta_add, and will be NULL here */ 1302 1295 if (vif->type == NL80211_IFTYPE_STATION) { 1303 1296 struct rtl_sta_info *sta_entry; 1297 + 1304 1298 sta_entry = (struct rtl_sta_info *)sta->drv_priv; 1305 1299 sta_entry->wireless_mode = mac->mode; 1306 1300 }
+5 -3
drivers/net/wireless/realtek/rtlwifi/efuse.c
··· 474 474 475 475 if (word_en != 0x0F) { 476 476 u8 tmpdata[8]; 477 + 477 478 memcpy(tmpdata, 478 479 &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base], 479 480 8); ··· 488 487 break; 489 488 } 490 489 } 491 - 492 490 } 493 491 494 492 efuse_power_switch(hw, true, false); ··· 662 662 static void efuse_read_all_map(struct ieee80211_hw *hw, u8 *efuse) 663 663 { 664 664 struct rtl_priv *rtlpriv = rtl_priv(hw); 665 + 665 666 efuse_power_switch(hw, false, true); 666 667 read_efuse(hw, 0, rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE], efuse); 667 668 efuse_power_switch(hw, false, false); ··· 813 812 if (0x0F != (badworden & 0x0F)) { 814 813 u8 reorg_offset = offset; 815 814 u8 reorg_worden = badworden; 815 + 816 816 efuse_pg_packet_write(hw, reorg_offset, 817 817 reorg_worden, 818 818 originaldata); ··· 903 901 if (0x0F != (badworden & 0x0F)) { 904 902 u8 reorg_offset = tmp_pkt.offset; 905 903 u8 reorg_worden = badworden; 904 + 906 905 efuse_pg_packet_write(hw, reorg_offset, 907 906 reorg_worden, 908 907 originaldata); ··· 960 957 961 958 while (continual && (efuse_addr < (EFUSE_MAX_SIZE - 962 959 rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))) { 963 - 964 960 if (write_state == PG_STATE_HEADER) { 965 961 dataempty = true; 966 962 badworden = 0x0F; ··· 1116 1114 u16 tmpv16; 1117 1115 1118 1116 if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) { 1119 - 1120 1117 if (rtlhal->hw_type != HARDWARE_TYPE_RTL8192CE && 1121 1118 rtlhal->hw_type != HARDWARE_TYPE_RTL8192DE) { 1122 1119 rtl_write_byte(rtlpriv, ··· 1220 1219 static u8 efuse_calculate_word_cnts(u8 word_en) 1221 1220 { 1222 1221 u8 word_cnts = 0; 1222 + 1223 1223 if (!(word_en & BIT(0))) 1224 1224 word_cnts++; 1225 1225 if (!(word_en & BIT(1)))
+1
drivers/net/wireless/realtek/rtlwifi/ps.c
··· 718 718 static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09}; 719 719 u8 noa_num, index , i, noa_index = 0; 720 720 bool find_p2p_ie = false , find_p2p_ps_ie = false; 721 + 721 722 pos = (u8 *)mgmt->u.beacon.variable; 722 723 end = data + len; 723 724 ie = NULL;
+2
drivers/net/wireless/realtek/rtlwifi/rc.c
··· 236 236 !(skb->protocol == cpu_to_be16(ETH_P_PAE))) { 237 237 if (ieee80211_is_data_qos(fc)) { 238 238 u8 tid = rtl_get_tid(skb); 239 + 239 240 if (_rtl_tx_aggr_check(rtlpriv, sta_entry, 240 241 tid)) { 241 242 sta_entry->tids[tid].agg.agg_state = ··· 294 293 struct ieee80211_sta *sta, void *priv_sta) 295 294 { 296 295 struct rtl_rate_priv *rate_priv = priv_sta; 296 + 297 297 kfree(rate_priv); 298 298 } 299 299
-1
drivers/net/wireless/realtek/rtlwifi/regd.c
··· 41 41 NL80211_RRF_PASSIVE_SCAN | \ 42 42 NL80211_RRF_NO_OFDM) 43 43 44 - 45 44 /* 5G chan 36 - chan 64*/ 46 45 #define RTL819x_5GHZ_5150_5350 \ 47 46 REG_RULE(5150-10, 5350+10, 80, 0, 30, 0)
+3
drivers/net/wireless/realtek/rtlwifi/usb.c
··· 267 267 268 268 for (i = 0; i < __RTL_TXQ_NUM; i++) { 269 269 u32 ep_num = rtlusb->ep_map.ep_mapping[i]; 270 + 270 271 if (!ep_num) { 271 272 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 272 273 "Invalid endpoint map setting!\n"); ··· 332 331 rtlusb->out_ep_nums = rtlusb->in_ep_nums = 0; 333 332 for (epidx = 0; epidx < epnums; epidx++) { 334 333 struct usb_endpoint_descriptor *pep_desc; 334 + 335 335 pep_desc = &usb_intf->cur_altsetting->endpoint[epidx].desc; 336 336 337 337 if (usb_endpoint_dir_in(pep_desc)) ··· 755 753 756 754 return err; 757 755 } 756 + 758 757 /** 759 758 * 760 759 *