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

rtlwifi: Fix alignment errors in wifi.h

The instances where statement continuations are improperly aligned have
been fixed.

There are no changes to generated code.

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
1dc89bb9 d3da329c

+42 -42
+42 -42
drivers/net/wireless/realtek/rtlwifi/wifi.h
··· 1466 1466 void (*write16_async)(struct rtl_priv *rtlpriv, u32 addr, u16 val); 1467 1467 void (*write32_async)(struct rtl_priv *rtlpriv, u32 addr, u32 val); 1468 1468 void (*writen_sync)(struct rtl_priv *rtlpriv, u32 addr, void *buf, 1469 - u16 len); 1469 + u16 len); 1470 1470 1471 1471 u8 (*read8_sync)(struct rtl_priv *rtlpriv, u32 addr); 1472 1472 u16 (*read16_sync)(struct rtl_priv *rtlpriv, u32 addr); ··· 2222 2222 void (*read_chip_version)(struct ieee80211_hw *hw); 2223 2223 void (*read_eeprom_info)(struct ieee80211_hw *hw); 2224 2224 void (*interrupt_recognized)(struct ieee80211_hw *hw, 2225 - struct rtl_int *intvec); 2225 + struct rtl_int *intvec); 2226 2226 int (*hw_init)(struct ieee80211_hw *hw); 2227 2227 void (*hw_disable)(struct ieee80211_hw *hw); 2228 2228 void (*hw_suspend)(struct ieee80211_hw *hw); ··· 2230 2230 void (*enable_interrupt)(struct ieee80211_hw *hw); 2231 2231 void (*disable_interrupt)(struct ieee80211_hw *hw); 2232 2232 int (*set_network_type)(struct ieee80211_hw *hw, 2233 - enum nl80211_iftype type); 2233 + enum nl80211_iftype type); 2234 2234 void (*set_chk_bssid)(struct ieee80211_hw *hw, 2235 - bool check_bssid); 2235 + bool check_bssid); 2236 2236 void (*set_bw_mode)(struct ieee80211_hw *hw, 2237 - enum nl80211_channel_type ch_type); 2237 + enum nl80211_channel_type ch_type); 2238 2238 u8 (*switch_channel)(struct ieee80211_hw *hw); 2239 2239 void (*set_qos)(struct ieee80211_hw *hw, int aci); 2240 2240 void (*set_bcn_reg)(struct ieee80211_hw *hw); 2241 2241 void (*set_bcn_intv)(struct ieee80211_hw *hw); 2242 2242 void (*update_interrupt_mask)(struct ieee80211_hw *hw, 2243 - u32 add_msr, u32 rm_msr); 2243 + u32 add_msr, u32 rm_msr); 2244 2244 void (*get_hw_reg)(struct ieee80211_hw *hw, u8 variable, u8 *val); 2245 2245 void (*set_hw_reg)(struct ieee80211_hw *hw, u8 variable, u8 *val); 2246 2246 void (*update_rate_tbl)(struct ieee80211_hw *hw, 2247 - struct ieee80211_sta *sta, u8 rssi_leve, 2248 - bool update_bw); 2247 + struct ieee80211_sta *sta, u8 rssi_leve, 2248 + bool update_bw); 2249 2249 void (*pre_fill_tx_bd_desc)(struct ieee80211_hw *hw, u8 *tx_bd_desc, 2250 2250 u8 *desc, u8 queue_index, 2251 2251 struct sk_buff *skb, dma_addr_t addr); ··· 2255 2255 void (*rx_check_dma_ok)(struct ieee80211_hw *hw, u8 *header_desc, 2256 2256 u8 queue_index); 2257 2257 void (*fill_tx_desc)(struct ieee80211_hw *hw, 2258 - struct ieee80211_hdr *hdr, u8 *pdesc_tx, 2259 - u8 *pbd_desc_tx, 2260 - struct ieee80211_tx_info *info, 2261 - struct ieee80211_sta *sta, 2262 - struct sk_buff *skb, u8 hw_queue, 2263 - struct rtl_tcb_desc *ptcb_desc); 2258 + struct ieee80211_hdr *hdr, u8 *pdesc_tx, 2259 + u8 *pbd_desc_tx, 2260 + struct ieee80211_tx_info *info, 2261 + struct ieee80211_sta *sta, 2262 + struct sk_buff *skb, u8 hw_queue, 2263 + struct rtl_tcb_desc *ptcb_desc); 2264 2264 void (*fill_fake_txdesc)(struct ieee80211_hw *hw, u8 *pdesc, 2265 2265 u32 buffer_len, bool bsspspoll); 2266 2266 void (*fill_tx_cmddesc)(struct ieee80211_hw *hw, u8 *pdesc, 2267 - bool firstseg, bool lastseg, 2268 - struct sk_buff *skb); 2267 + bool firstseg, bool lastseg, 2268 + struct sk_buff *skb); 2269 2269 void (*fill_tx_special_desc)(struct ieee80211_hw *hw, 2270 2270 u8 *pdesc, u8 *pbd_desc, 2271 2271 struct sk_buff *skb, u8 hw_queue); 2272 2272 bool (*query_rx_desc)(struct ieee80211_hw *hw, 2273 - struct rtl_stats *stats, 2274 - struct ieee80211_rx_status *rx_status, 2275 - u8 *pdesc, struct sk_buff *skb); 2273 + struct rtl_stats *stats, 2274 + struct ieee80211_rx_status *rx_status, 2275 + u8 *pdesc, struct sk_buff *skb); 2276 2276 void (*set_channel_access)(struct ieee80211_hw *hw); 2277 2277 bool (*radio_onoff_checking)(struct ieee80211_hw *hw, u8 *valid); 2278 2278 void (*dm_watchdog)(struct ieee80211_hw *hw); 2279 2279 void (*scan_operation_backup)(struct ieee80211_hw *hw, u8 operation); 2280 2280 bool (*set_rf_power_state)(struct ieee80211_hw *hw, 2281 - enum rf_pwrstate rfpwr_state); 2281 + enum rf_pwrstate rfpwr_state); 2282 2282 void (*led_control)(struct ieee80211_hw *hw, 2283 - enum led_ctl_mode ledaction); 2283 + enum led_ctl_mode ledaction); 2284 2284 void (*set_desc)(struct ieee80211_hw *hw, u8 *pdesc, bool istx, 2285 2285 u8 desc_name, u8 *val); 2286 2286 u64 (*get_desc)(struct ieee80211_hw *hw, u8 *pdesc, bool istx, 2287 2287 u8 desc_name); 2288 2288 bool (*is_tx_desc_closed)(struct ieee80211_hw *hw, 2289 - u8 hw_queue, u16 index); 2289 + u8 hw_queue, u16 index); 2290 2290 void (*tx_polling)(struct ieee80211_hw *hw, u8 hw_queue); 2291 2291 void (*enable_hw_sec)(struct ieee80211_hw *hw); 2292 2292 void (*set_key)(struct ieee80211_hw *hw, u32 key_index, 2293 - u8 *macaddr, bool is_group, u8 enc_algo, 2294 - bool is_wepkey, bool clear_all); 2293 + u8 *macaddr, bool is_group, u8 enc_algo, 2294 + bool is_wepkey, bool clear_all); 2295 2295 void (*init_sw_leds)(struct ieee80211_hw *hw); 2296 2296 void (*deinit_sw_leds)(struct ieee80211_hw *hw); 2297 2297 u32 (*get_bbreg)(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask); 2298 2298 void (*set_bbreg)(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, 2299 - u32 data); 2299 + u32 data); 2300 2300 u32 (*get_rfreg)(struct ieee80211_hw *hw, enum radio_path rfpath, 2301 - u32 regaddr, u32 bitmask); 2301 + u32 regaddr, u32 bitmask); 2302 2302 void (*set_rfreg)(struct ieee80211_hw *hw, enum radio_path rfpath, 2303 - u32 regaddr, u32 bitmask, u32 data); 2303 + u32 regaddr, u32 bitmask, u32 data); 2304 2304 void (*linked_set_reg)(struct ieee80211_hw *hw); 2305 2305 void (*chk_switch_dmdp)(struct ieee80211_hw *hw); 2306 2306 void (*dualmac_easy_concurrent)(struct ieee80211_hw *hw); 2307 2307 void (*dualmac_switch_to_dmdp)(struct ieee80211_hw *hw); 2308 2308 bool (*phy_rf6052_config)(struct ieee80211_hw *hw); 2309 2309 void (*phy_rf6052_set_cck_txpower)(struct ieee80211_hw *hw, 2310 - u8 *powerlevel); 2310 + u8 *powerlevel); 2311 2311 void (*phy_rf6052_set_ofdm_txpower)(struct ieee80211_hw *hw, 2312 - u8 *ppowerlevel, u8 channel); 2312 + u8 *ppowerlevel, u8 channel); 2313 2313 bool (*config_bb_with_headerfile)(struct ieee80211_hw *hw, 2314 - u8 configtype); 2314 + u8 configtype); 2315 2315 bool (*config_bb_with_pgheaderfile)(struct ieee80211_hw *hw, 2316 - u8 configtype); 2316 + u8 configtype); 2317 2317 void (*phy_lc_calibrate)(struct ieee80211_hw *hw, bool is2t); 2318 2318 void (*phy_set_bw_mode_callback)(struct ieee80211_hw *hw); 2319 2319 void (*dm_dynamic_txpower)(struct ieee80211_hw *hw); 2320 2320 void (*c2h_command_handle)(struct ieee80211_hw *hw); 2321 2321 void (*bt_wifi_media_status_notify)(struct ieee80211_hw *hw, 2322 - bool mstate); 2322 + bool mstate); 2323 2323 void (*bt_coex_off_before_lps)(struct ieee80211_hw *hw); 2324 2324 void (*fill_h2c_cmd)(struct ieee80211_hw *hw, u8 element_id, 2325 - u32 cmd_len, u8 *p_cmdbuffer); 2325 + u32 cmd_len, u8 *p_cmdbuffer); 2326 2326 void (*set_default_port_id_cmd)(struct ieee80211_hw *hw); 2327 2327 bool (*get_btc_status)(void); 2328 2328 bool (*is_fw_header)(struct rtlwifi_firmware_header *hdr); ··· 2343 2343 struct rtl_priv **buddy_priv); 2344 2344 2345 2345 int (*adapter_tx)(struct ieee80211_hw *hw, 2346 - struct ieee80211_sta *sta, 2347 - struct sk_buff *skb, 2348 - struct rtl_tcb_desc *ptcb_desc); 2346 + struct ieee80211_sta *sta, 2347 + struct sk_buff *skb, 2348 + struct rtl_tcb_desc *ptcb_desc); 2349 2349 void (*flush)(struct ieee80211_hw *hw, u32 queues, bool drop); 2350 2350 int (*reset_trx_ring)(struct ieee80211_hw *hw); 2351 2351 bool (*waitq_insert)(struct ieee80211_hw *hw, 2352 - struct ieee80211_sta *sta, 2353 - struct sk_buff *skb); 2352 + struct ieee80211_sta *sta, 2353 + struct sk_buff *skb); 2354 2354 2355 2355 /*pci */ 2356 2356 void (*disable_aspm)(struct ieee80211_hw *hw); ··· 2689 2689 u8 scantype); 2690 2690 void (*btc_connect_notify)(struct rtl_priv *rtlpriv, u8 action); 2691 2691 void (*btc_mediastatus_notify)(struct rtl_priv *rtlpriv, 2692 - enum rt_media_status mstatus); 2692 + enum rt_media_status mstatus); 2693 2693 void (*btc_periodical)(struct rtl_priv *rtlpriv); 2694 2694 void (*btc_halt_notify)(struct rtl_priv *rtlpriv); 2695 2695 void (*btc_btinfo_notify)(struct rtl_priv *rtlpriv, 2696 - u8 *tmp_buf, u8 length); 2696 + u8 *tmp_buf, u8 length); 2697 2697 void (*btc_btmpinfo_notify)(struct rtl_priv *rtlpriv, 2698 2698 u8 *tmp_buf, u8 length); 2699 2699 bool (*btc_is_limited_dig)(struct rtl_priv *rtlpriv); ··· 3155 3155 } 3156 3156 3157 3157 static inline void rtl_set_bbreg_with_dwmask(struct ieee80211_hw *hw, 3158 - u32 regaddr, u32 data) 3158 + u32 regaddr, u32 data) 3159 3159 { 3160 3160 rtl_set_bbreg(hw, regaddr, 0xffffffff, data); 3161 3161 } ··· 3226 3226 } 3227 3227 3228 3228 static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw, 3229 - u8 *mac_addr) 3229 + u8 *mac_addr) 3230 3230 { 3231 3231 struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); 3232 3232 return ieee80211_find_sta(mac->vif, mac_addr);