projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f6cf663)
staging: r8188eu: remove unnecessary parentheses in core/rtw_p2p.c
authorMichael Straube <straube.linux@gmail.com>
Mon, 9 Aug 2021 16:49:57 +0000 (18:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Aug 2021 10:20:05 +0000 (12:20 +0200)
Remove unnecessary parentheses in core/rtw_p2p.c.
Most of them reported by checkpatch.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210809165007.23204-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_p2p.c patch | blob | history

diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188eu/core/rtw_p2p.c
index b449744..9b3ea8a 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_p2p.c
+++ b/drivers/staging/r8188eu/core/rtw_p2p.c
@@ -118,8 +118,8 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
        struct rtw_ieee80211_hdr        *pwlanhdr;
        __le16 *fctrl;
        struct adapter *padapter = pwdinfo->padapter;
-       struct xmit_priv                        *pxmitpriv = &(padapter->xmitpriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
+       struct xmit_priv                        *pxmitpriv = &padapter->xmitpriv;
+       struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */
        __be32  p2poui = cpu_to_be32(P2POUI);
        u8      oui_subtype = P2P_GO_DISC_REQUEST;
@@ -140,7 +140,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
        pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
        pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
 
-       fctrl = &(pwlanhdr->frame_ctl);
+       fctrl = &pwlanhdr->frame_ctl;
        *(fctrl) = 0;
 
        memcpy(pwlanhdr->addr1, da, ETH_ALEN);
@@ -155,10 +155,10 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
        pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
 
        /* Build P2P action frame header */
-       pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&(p2poui), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen));
+       pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&p2poui, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &oui_subtype, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &dialogToken, &pattrib->pktlen);
 
        /* there is no IE in this P2P action frame */
 
@@ -175,8 +175,8 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
        struct rtw_ieee80211_hdr        *pwlanhdr;
        __le16 *fctrl;
        struct adapter *padapter = pwdinfo->padapter;
-       struct xmit_priv                        *pxmitpriv = &(padapter->xmitpriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
+       struct xmit_priv                        *pxmitpriv = &padapter->xmitpriv;
+       struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
        u8                      action = P2P_PUB_ACTION_ACTION;
        __be32                  p2poui = cpu_to_be32(P2POUI);
@@ -199,7 +199,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
        pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
        pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
 
-       fctrl = &(pwlanhdr->frame_ctl);
+       fctrl = &pwlanhdr->frame_ctl;
        *(fctrl) = 0;
 
        memcpy(pwlanhdr->addr1, da, ETH_ALEN);
@@ -214,11 +214,11 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
        pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
 
        /* Build P2P public action frame header */
-       pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&(p2poui), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen));
+       pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&p2poui, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &oui_subtype, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &dialogToken, &pattrib->pktlen);
 
        /* Build P2P IE */
        /*      P2P OUI */
@@ -253,8 +253,8 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr,
        unsigned char                                   *pframe;
        struct rtw_ieee80211_hdr        *pwlanhdr;
        __le16 *fctrl;
-       struct xmit_priv                        *pxmitpriv = &(padapter->xmitpriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
+       struct xmit_priv                        *pxmitpriv = &padapter->xmitpriv;
+       struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
        if (!pmgntframe)
@@ -269,12 +269,12 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr,
        pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
        pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
 
-       fctrl = &(pwlanhdr->frame_ctl);
+       fctrl = &pwlanhdr->frame_ctl;
        *(fctrl) = 0;
 
        memcpy(pwlanhdr->addr1, raddr, ETH_ALEN);
-       memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
-       memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN);
+       memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);
+       memcpy(pwlanhdr->addr3, myid(&padapter->eeprompriv), ETH_ALEN);
 
        SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
        pmlmeext->mgnt_seq++;
@@ -283,11 +283,11 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr,
        pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
        pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
 
-       pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&(p2poui), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen));
+       pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&p2poui, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &oui_subtype, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &dialogToken, &pattrib->pktlen);
 
        wpsielen = 0;
        /*      WPS OUI */
@@ -322,8 +322,8 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
        struct rtw_ieee80211_hdr        *pwlanhdr;
        __le16 *fctrl;
        struct adapter *padapter = pwdinfo->padapter;
-       struct xmit_priv                        *pxmitpriv = &(padapter->xmitpriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
+       struct xmit_priv                        *pxmitpriv = &padapter->xmitpriv;
+       struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */
        __be32  p2poui = cpu_to_be32(P2POUI);
        u8      oui_subtype = P2P_PRESENCE_RESPONSE;
@@ -346,7 +346,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
        pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
        pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
 
-       fctrl = &(pwlanhdr->frame_ctl);
+       fctrl = &pwlanhdr->frame_ctl;
        *(fctrl) = 0;
 
        memcpy(pwlanhdr->addr1, da, ETH_ALEN);
@@ -361,10 +361,10 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
        pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
 
        /* Build P2P action frame header */
-       pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&(p2poui), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen));
-       pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen));
+       pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&p2poui, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &oui_subtype, &pattrib->pktlen);
+       pframe = rtw_set_fixed_ie(pframe, 1, &dialogToken, &pattrib->pktlen);
 
        /* Add P2P IE header */
        /*      P2P OUI */
@@ -385,7 +385,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
 
        p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_NOA, 2, noa_attr_content);
 
-       pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &(pattrib->pktlen));
+       pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &pattrib->pktlen);
 
        pattrib->last_txcmdsz = pattrib->pktlen;
 
@@ -1556,7 +1556,7 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
        u8      noa_attr[MAX_P2P_IE_LEN] = { 0x00 };/*  NoA length should be n*(13) + 2 */
        u32     attr_contentlen = 0;
 
-       struct wifidirect_info  *pwdinfo = &(padapter->wdinfo);
+       struct wifidirect_info  *pwdinfo = &padapter->wdinfo;
        u8      find_p2p = false, find_p2p_ps = false;
        u8      noa_offset, noa_num, noa_index;
 
@@ -1636,7 +1636,7 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
 void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
 {
        struct pwrctrl_priv             *pwrpriv = &padapter->pwrctrlpriv;
-       struct wifidirect_info  *pwdinfo = &(padapter->wdinfo);
+       struct wifidirect_info  *pwdinfo = &padapter->wdinfo;
 
        /*  Pre action for p2p state */
        switch (p2p_ps_state) {
@@ -1653,7 +1653,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
                if (padapter->pwrctrlpriv.bFwCurrentInPSMode) {
                        if (pwrpriv->smart_ps == 0) {
                                pwrpriv->smart_ps = 2;
-                               rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode)));
+                               rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&padapter->pwrctrlpriv.pwr_mode));
                        }
                }
                break;
@@ -1665,7 +1665,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
                                if (pwrpriv->smart_ps != 0) {
                                        pwrpriv->smart_ps = 0;
                                        DBG_88E("%s(): Enter CTW, change SmartPS\n", __func__);
-                                       rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode)));
+                                       rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&padapter->pwrctrlpriv.pwr_mode));
                                }
                        }
                        rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_state));
@@ -1689,7 +1689,7 @@ u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue)
 {
        struct cmd_obj  *ph2c;
        struct drvextra_cmd_parm        *pdrvextra_cmd_parm;
-       struct wifidirect_info  *pwdinfo = &(padapter->wdinfo);
+       struct wifidirect_info  *pwdinfo = &padapter->wdinfo;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8      res = _SUCCESS;
 
@@ -1938,7 +1938,7 @@ void init_wifidirect_info(struct adapter *padapter, enum P2P_ROLE role)
 int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
 {
        int ret = _SUCCESS;
-       struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
+       struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
        if (role == P2P_ROLE_DEVICE || role == P2P_ROLE_CLIENT || role == P2P_ROLE_GO) {
                /* leave IPS/Autosuspend */
Domain: System / Kernel;