Staging: rtl8188eu: Fix alignment coding style issue

Fix "Alignment should match open parenthesis" issues reported by
checkpatch.pl for all files under drivers/staging/rtl8188eu/core.

Line rtw_mlme_ext.c:373 is left overlength for readability.

Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Link: https://lore.kernel.org/r/1593013645-19130-1-git-send-email-yepeilin.cs@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index f69e9453ad458dd06172ba8c8b4d8aaa45ef2874..a97d500810716538644843b9efa4b9af0190dc16 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -229,7 +229,7 @@ _next:
  * LOCKED pmlmepriv->lock
  */
 u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid, int ssid_num,
-       struct rtw_ieee80211_channel *ch, int ch_num)
+                     struct rtw_ieee80211_channel *ch, int ch_num)
 {
        u8 res = _FAIL;
        struct cmd_obj          *ph2c;
@@ -449,7 +449,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
                    (padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {
                        /* rtw_restructure_ht_ie */
                        rtw_restructure_ht_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0],
-                                                                       pnetwork->network.ie_length, &psecnetwork->ie_length);
+                                             pnetwork->network.ie_length, &psecnetwork->ie_length);
                }
        }
 

diff --git a/drivers/staging/rtl8188eu/core/rtw_debug.c b/drivers/staging/rtl8188eu/core/rtw_debug.c
index d0e41f2ef1ce8cc6316e81d1f3e111397687a2ab..fcc8bd1011e1370112e70b1becc6e5e3a64646d9 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_debug.c
+++ b/drivers/staging/rtl8188eu/core/rtw_debug.c
@@ -10,8 +10,8 @@
 #include <usb_ops_linux.h>
 
 int proc_get_drv_version(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
+                        off_t offset, int count,
+                        int *eof, void *data)
 {
        int len = 0;
 
@@ -22,15 +22,15 @@ int proc_get_drv_version(char *page, char **start,
 }
 
 int proc_get_write_reg(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
+                      off_t offset, int count,
+                      int *eof, void *data)
 {
        *eof = 1;
        return 0;
 }
 
 int proc_set_write_reg(struct file *file, const char __user *buffer,
-               unsigned long count, void *data)
+                      unsigned long count, void *data)
 {
        struct net_device *dev = data;
        struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@@ -71,8 +71,8 @@ static u32 proc_get_read_addr = 0xeeeeeeee;
 static u32 proc_get_read_len = 0x4;
 
 int proc_get_read_reg(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
+                     off_t offset, int count,
+                     int *eof, void *data)
 {
        struct net_device *dev = data;
        struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@@ -104,7 +104,7 @@ int proc_get_read_reg(char *page, char **start,
 }
 
 int proc_set_read_reg(struct file *file, const char __user *buffer,
-               unsigned long count, void *data)
+                     unsigned long count, void *data)
 {
        char tmp[16];
        u32 addr, len;
@@ -131,8 +131,8 @@ int proc_set_read_reg(struct file *file, const char __user *buffer,
 }
 
 int proc_get_adapter_state(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
+                          off_t offset, int count,
+                          int *eof, void *data)
 {
        struct net_device *dev = data;
        struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index caf600eba03be6b82998332a195f611c074941fa..5630d5d763db5dc5bf862f2515fc8064fab27623 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -675,8 +675,7 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8
 }
 
 static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
-                                           struct rtw_ieee802_11_elems *elems,
-                                           int show_errors)
+                                               struct rtw_ieee802_11_elems *elems, int show_errors)
 {
        unsigned int oui;
 
@@ -766,8 +765,8 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
  * Returns: Parsing result
  */
 enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len,
-                               struct rtw_ieee802_11_elems *elems,
-                               int show_errors)
+                                         struct rtw_ieee802_11_elems *elems,
+                                         int show_errors)
 {
        uint left = len;
        u8 *pos = start;
@@ -921,8 +920,10 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
                        pnetwork->BcnInfo.pairwise_cipher = pairwise_cipher;
                        pnetwork->BcnInfo.group_cipher = group_cipher;
                        pnetwork->BcnInfo.is_8021x = is8021x;
-                       RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: pnetwork->pairwise_cipher: %d, is_8021x is %d",
-                                __func__, pnetwork->BcnInfo.pairwise_cipher, pnetwork->BcnInfo.is_8021x));
+                       RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
+                                ("%s: pnetwork->pairwise_cipher: %d, is_8021x is %d",
+                                 __func__, pnetwork->BcnInfo.pairwise_cipher,
+                                 pnetwork->BcnInfo.is_8021x));
                        ret = _SUCCESS;
                }
        } else {
@@ -979,9 +980,9 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
                        pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WEP;
        }
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: pnetwork->encryp_protocol is %x\n",
-                pnetwork->BcnInfo.encryp_protocol));
+                                                      pnetwork->BcnInfo.encryp_protocol));
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: pnetwork->encryp_protocol is %x\n",
-                pnetwork->BcnInfo.encryp_protocol));
+                                                      pnetwork->BcnInfo.encryp_protocol));
        rtw_get_cipher_info(pnetwork);
 
        /* get bwmode and ch_offset */

diff --git a/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c b/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
index 7d56767cdff6d050a68060908a01ac736fa5343d..7bb26c362b10ed6a1f3a4e3fc41f893c191f2117 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
@@ -306,7 +306,7 @@ exit:
 }
 
 u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
-       enum ndis_802_11_network_infra networktype)
+                                     enum ndis_802_11_network_infra networktype)
 {
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct wlan_network *cur_network = &pmlmepriv->cur_network;

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index 9de2d421f6b1793e967a1fea22cc52eb05e5b61c..b291ee6ca8f4eae58f1e3eeb7e096cfb36dd369e 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -334,7 +334,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue)
 }
 
 void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
-       struct adapter *padapter, bool update_ie)
+                   struct adapter *padapter, bool update_ie)
 {
        long rssi_ori = dst->Rssi;
        u8 sq_smp = src->PhyInfo.SignalQuality;
@@ -646,7 +646,7 @@ void rtw_surveydone_event_callback(struct adapter   *adapter, u8 *pbuf)
                        s_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);
                        if (s_ret == _SUCCESS) {
                                mod_timer(&pmlmepriv->assoc_timer,
-                                       jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
+                                         jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
                        } else if (s_ret == 2) { /* there is no need to wait for join */
                                _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
                                rtw_indicate_connect(adapter);

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 8d035f67ef6135efad840e0e68e2e51dff689388..f6b9a39799ce029aa84b90f01d92c8fcf2512691 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -370,7 +370,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms)
                pframe += (cur_network->ie_length + len_diff);
                pattrib->pktlen += (cur_network->ie_length + len_diff);
                wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr + TXDESC_OFFSET + sizeof(struct ieee80211_hdr_3addr) + _BEACON_IE_OFFSET_,
-                       pattrib->pktlen - sizeof(struct ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_, NULL, &wps_ielen);
+                                       pattrib->pktlen - sizeof(struct ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_, NULL, &wps_ielen);
                if (wps_ie && wps_ielen > 0)
                        rtw_get_wps_attr_content(wps_ie,  wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8 *)(&sr), NULL);
                if (sr != 0)
@@ -1932,12 +1932,12 @@ static void site_survey(struct adapter *padapter)
                                if (pmlmeext->sitesurvey_res.ssid[i].ssid_length) {
                                        /* todo: to issue two probe req??? */
                                        issue_probereq(padapter,
-                                       &pmlmeext->sitesurvey_res.ssid[i],
-                                                               NULL, false);
+                                                      &pmlmeext->sitesurvey_res.ssid[i],
+                                                      NULL, false);
                                        /* msleep(SURVEY_TO>>1); */
                                        issue_probereq(padapter,
-                                       &pmlmeext->sitesurvey_res.ssid[i],
-                                                               NULL, false);
+                                                      &pmlmeext->sitesurvey_res.ssid[i],
+                                                      NULL, false);
                                }
                        }
 
@@ -2522,7 +2522,7 @@ static unsigned int OnProbeReq(struct adapter *padapter,
                return _SUCCESS;
 
        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, &ielen,
-                       len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
+                      len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
 
        /* check (wildcard) SSID */
        if (p) {
@@ -2759,7 +2759,7 @@ static unsigned int OnAuth(struct adapter *padapter,
                        DBG_88E("checking for challenging txt...\n");
 
                        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, &ie_len,
-                                       len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
+                                      len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
 
                        if (!p || ie_len <= 0) {
                                DBG_88E("auth rejected because challenge failure!(1)\n");
@@ -2853,7 +2853,7 @@ static unsigned int OnAuthClient(struct adapter *padapter,
                if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {
                        /*  legendary shared system */
                        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, &len,
-                               pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
+                                      pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
 
                        if (!p)
                                goto authclnt_fail;
@@ -2966,7 +2966,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
        /*  now we should check all the fields... */
        /*  checking SSID */
        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _SSID_IE_, &ie_len,
-               pkt_len - WLAN_HDR_A3_LEN - ie_offset);
+                      pkt_len - WLAN_HDR_A3_LEN - ie_offset);
 
        if (!p || ie_len == 0) {
                /*  broadcast ssid, however it is not allowed in assocreq */
@@ -2999,7 +2999,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
                supportRateNum = ie_len;
 
                p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_, &ie_len,
-                               pkt_len - WLAN_HDR_A3_LEN - ie_offset);
+                              pkt_len - WLAN_HDR_A3_LEN - ie_offset);
                if (p) {
                        if (supportRateNum <= sizeof(supportRate)) {
                                memcpy(supportRate + supportRateNum,
@@ -3913,8 +3913,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter)
 }
 
 static int has_channel(struct rt_channel_info *channel_set,
-                                          u8 chanset_size,
-                                          u8 chan)
+                      u8 chanset_size, u8 chan)
 {
        int i;
 
@@ -4671,18 +4670,15 @@ void linked_status_chk(struct adapter *padapter)
                        } else {
                                if (rx_chk != _SUCCESS) {
                                        if (pmlmeext->retry == 0) {
-                                               issue_probereq(padapter,
-                                               &pmlmeinfo->network.ssid,
-                                               pmlmeinfo->network.MacAddress,
-                                                                       false);
-                                               issue_probereq(padapter,
-                                               &pmlmeinfo->network.ssid,
-                                               pmlmeinfo->network.MacAddress,
-                                                                       false);
-                                               issue_probereq(padapter,
-                                               &pmlmeinfo->network.ssid,
-                                               pmlmeinfo->network.MacAddress,
-                                                                       false);
+                                               issue_probereq(padapter, &pmlmeinfo->network.ssid,
+                                                              pmlmeinfo->network.MacAddress,
+                                                              false);
+                                               issue_probereq(padapter, &pmlmeinfo->network.ssid,
+                                                              pmlmeinfo->network.MacAddress,
+                                                              false);
+                                               issue_probereq(padapter, &pmlmeinfo->network.ssid,
+                                                              pmlmeinfo->network.MacAddress,
+                                                              false);
                                        }
                                }
 
@@ -5330,7 +5326,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
        }
 
        ptxBeacon_parm = kmemdup(&pmlmeinfo->network,
-                               sizeof(struct wlan_bssid_ex), GFP_ATOMIC);
+                                sizeof(struct wlan_bssid_ex), GFP_ATOMIC);
        if (!ptxBeacon_parm) {
                kfree(ph2c);
                res = _FAIL;

diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index c000382c96d9d09ab8cb760dc7a271e0202e75dd..e7777bf3bafb21d21b45aea79c5fa016960bc7b9 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -264,7 +264,7 @@ static void pwr_state_check_handler(struct timer_list *t)
 {
        struct adapter *padapter =
                from_timer(padapter, t,
-                               pwrctrlpriv.pwr_state_check_timer);
+                          pwrctrlpriv.pwr_state_check_timer);
 
        rtw_ps_cmd(padapter);
 }

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 0257e56b551a704f49f4cdfb6012f3180a6cd8a1..61ea8f38829cc2865561496fd06337fc77fab46d 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -59,7 +59,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
                INIT_LIST_HEAD(&precvframe->list);
 
                list_add_tail(&precvframe->list,
-                                    &precvpriv->free_recv_queue.queue);
+                             &precvpriv->free_recv_queue.queue);
 
                precvframe->pkt = NULL;
 
@@ -1184,21 +1184,21 @@ static int validate_recv_frame(struct adapter *adapter,
                if (_drv_err_ <= GlobalDebugLevel) {
                        pr_info(DRIVER_PREFIX "#############################\n");
                        print_hex_dump(KERN_INFO, DRIVER_PREFIX, DUMP_PREFIX_NONE,
-                                       16, 1, ptr, 64, false);
+                                      16, 1, ptr, 64, false);
                        pr_info(DRIVER_PREFIX "#############################\n");
                }
        } else if (bDumpRxPkt == 2) {
                if ((_drv_err_ <= GlobalDebugLevel) && (type == WIFI_MGT_TYPE)) {
                        pr_info(DRIVER_PREFIX "#############################\n");
                        print_hex_dump(KERN_INFO, DRIVER_PREFIX, DUMP_PREFIX_NONE,
-                                       16, 1, ptr, 64, false);
+                                      16, 1, ptr, 64, false);
                        pr_info(DRIVER_PREFIX "#############################\n");
                }
        } else if (bDumpRxPkt == 3) {
                if ((_drv_err_ <= GlobalDebugLevel) && (type == WIFI_DATA_TYPE)) {
                        pr_info(DRIVER_PREFIX "#############################\n");
                        print_hex_dump(KERN_INFO, DRIVER_PREFIX, DUMP_PREFIX_NONE,
-                                       16, 1, ptr, 64, false);
+                                      16, 1, ptr, 64, false);
                        pr_info(DRIVER_PREFIX "#############################\n");
                }
        }