Commit b87e5fd5 authored by Xingquan Liu's avatar Xingquan Liu Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: remove parentheses after & 



Remove parentheses after & to fix checkpatch warning
Unnecessary parentheses.

Signed-off-by: default avatarXingquan Liu <b1n@b1n.io>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20241003070353.65998-1-b1n@b1n.io


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06489473

drivers/staging/rtl8712/rtl871x_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int r8712_init_cmd_priv(struct cmd_priv *pcmdpriv) 
	init_completion(&pcmdpriv->cmd_queue_comp);

	init_completion(&pcmdpriv->terminate_cmdthread_comp);



	_init_queue(&(pcmdpriv->cmd_queue));

	_init_queue(&pcmdpriv->cmd_queue);



	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */

	pcmdpriv->cmd_seq = 1;
@@ -633,7 +633,7 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter, struct cmd_obj *pcm 
	struct wlan_network *pwlan = NULL;

	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;

	struct wlan_network *tgt_network = &(pmlmepriv->cur_network);

	struct wlan_network *tgt_network = &pmlmepriv->cur_network;



	if (pcmd->res != H2C_SUCCESS)

		mod_timer(&pmlmepriv->assoc_timer, jiffies + msecs_to_jiffies(1));
@@ -672,10 +672,10 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter, struct cmd_obj *pcm 
				goto createbss_cmd_fail;

			pwlan->last_scanned = jiffies;

		} else {

			list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);

			list_add_tail(&pwlan->list, &pmlmepriv->scanned_queue.queue);

		}

		pnetwork->Length = r8712_get_wlan_bssid_ex_sz(pnetwork);

		memcpy(&(pwlan->network), pnetwork, pnetwork->Length);

		memcpy(&pwlan->network, pnetwork, pnetwork->Length);

		pwlan->fixed = true;

		memcpy(&tgt_network->network, pnetwork, (r8712_get_wlan_bssid_ex_sz(pnetwork)));

		if (pmlmepriv->fw_state & _FW_UNDER_LINKING)

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int r871x_wx_set_priv(struct net_device *dev, 
		/*Return received signal strength indicator in -db for */

		/* current AP */

		/*<ssid> Rssi xx */

		struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

		struct wlan_network *pcur_network = &pmlmepriv->cur_network;

		/*static u8 xxxx; */

		if (check_fwstate(pmlmepriv, _FW_LINKED)) {

drivers/staging/rtl8712/rtl871x_ioctl_rtl.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ enum _CONNECT_STATE_ { 
uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)

{

	struct _adapter *padapter = poid_par_priv->adapter_context;

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	u32 ulInfo;



	if (poid_par_priv->type_of_oid != QUERY_OID)

drivers/staging/rtl8712/rtl871x_ioctl_set.c

+3 −3
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ static u8 do_join(struct _adapter *padapter) 
{

	struct list_head *plist, *phead;

	u8 *pibss = NULL;

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct  __queue	*queue	= &(pmlmepriv->scanned_queue);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct  __queue	*queue	= &pmlmepriv->scanned_queue;

	int ret;



	phead = &queue->queue;
@@ -228,7 +228,7 @@ void r8712_set_802_11_infrastructure_mode(struct _adapter *padapter, 
	struct mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct wlan_network	*cur_network = &pmlmepriv->cur_network;

	enum NDIS_802_11_NETWORK_INFRASTRUCTURE *pold_state =

				&(cur_network->network.InfrastructureMode);

				&cur_network->network.InfrastructureMode;



	if (*pold_state != networktype) {

		spin_lock_irqsave(&pmlmepriv->lock, irqL);

drivers/staging/rtl8712/rtl871x_mlme.c

+17 −17
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ int r8712_init_mlme_priv(struct _adapter *padapter) 
				 Ndis802_11AutoUnknown;

	/* Maybe someday we should rename this variable to "active_mode"(Jeff)*/

	pmlmepriv->passive_mode = 1; /* 1: active, 0: passive. */

	spin_lock_init(&(pmlmepriv->lock));

	spin_lock_init(&(pmlmepriv->lock2));

	_init_queue(&(pmlmepriv->free_bss_pool));

	_init_queue(&(pmlmepriv->scanned_queue));

	spin_lock_init(&pmlmepriv->lock);

	spin_lock_init(&pmlmepriv->lock2);

	_init_queue(&pmlmepriv->free_bss_pool);

	_init_queue(&pmlmepriv->scanned_queue);

	set_scanned_network_val(pmlmepriv, 0);

	memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));

	pbuf = kmalloc_array(MAX_BSS_CNT, sizeof(struct wlan_network),
@@ -57,9 +57,9 @@ int r8712_init_mlme_priv(struct _adapter *padapter) 
	pmlmepriv->free_bss_buf = pbuf;

	pnetwork = (struct wlan_network *)pbuf;

	for (i = 0; i < MAX_BSS_CNT; i++) {

		INIT_LIST_HEAD(&(pnetwork->list));

		list_add_tail(&(pnetwork->list),

				 &(pmlmepriv->free_bss_pool.queue));

		INIT_LIST_HEAD(&pnetwork->list);

		list_add_tail(&pnetwork->list,

				 &pmlmepriv->free_bss_pool.queue);

		pnetwork++;

	}

	pmlmepriv->sitesurveyctrl.last_rx_pkts = 0;
@@ -93,7 +93,7 @@ static void _free_network(struct mlme_priv *pmlmepriv, 
{

	u32 curr_time, delta_time;

	unsigned long irqL;

	struct  __queue *free_queue = &(pmlmepriv->free_bss_pool);

	struct  __queue *free_queue = &pmlmepriv->free_bss_pool;



	if (!pnetwork)

		return;
@@ -285,7 +285,7 @@ static void update_network(struct wlan_bssid_ex *dst, 
	struct smooth_rssi_data *sqd = &padapter->recvpriv.signal_qual_data;



	if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) &&

	    is_same_network(&(padapter->mlmepriv.cur_network.network), src)) {

	    is_same_network(&padapter->mlmepriv.cur_network.network, src)) {

		if (padapter->recvpriv.signal_qual_data.total_num++ >=

		    PHY_LINKQUALITY_SLID_WIN_MAX) {

			padapter->recvpriv.signal_qual_data.total_num =
@@ -317,8 +317,8 @@ static void update_current_network(struct _adapter *adapter, 
{

	struct mlme_priv *pmlmepriv = &adapter->mlmepriv;



	if (is_same_network(&(pmlmepriv->cur_network.network), pnetwork)) {

		update_network(&(pmlmepriv->cur_network.network),

	if (is_same_network(&pmlmepriv->cur_network.network, pnetwork)) {

		update_network(&pmlmepriv->cur_network.network,

			       pnetwork, adapter);

		r8712_update_protection(adapter,

			       (pmlmepriv->cur_network.network.IEs) +
@@ -483,7 +483,7 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf) 
	spin_lock_irqsave(&pmlmepriv->lock2, flags);

	/* update IBSS_network 's timestamp */

	if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

		if (!memcmp(&(pmlmepriv->cur_network.network.MacAddress),

		if (!memcmp(&pmlmepriv->cur_network.network.MacAddress,

		    pnetwork->MacAddress, ETH_ALEN)) {

			struct wlan_network *ibss_wlan = NULL;
@@ -536,7 +536,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf) 
						  msecs_to_jiffies(MAX_JOIN_TIMEOUT));

				} else {

					struct wlan_bssid_ex *pdev_network =

					  &(adapter->registrypriv.dev_network);

					  &adapter->registrypriv.dev_network;

					u8 *pibss =

						 adapter->registrypriv.dev_network.MacAddress;

					pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
@@ -726,7 +726,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) 
						cur_network->network.MacAddress);

					spin_lock_irqsave(&pstapriv->sta_hash_lock, irqL2);

					r8712_free_stainfo(adapter, pcur_sta);

					spin_unlock_irqrestore(&(pstapriv->sta_hash_lock), irqL2);

					spin_unlock_irqrestore(&pstapriv->sta_hash_lock, irqL2);



					ptarget_wlan =

						r8712_find_network(&pmlmepriv->scanned_queue,
@@ -846,7 +846,7 @@ void r8712_stassoc_event_callback(struct _adapter *adapter, u8 *pbuf) 
{

	unsigned long irqL;

	struct sta_info *psta;

	struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &adapter->mlmepriv;

	struct stassoc_event *pstassoc	= (struct stassoc_event *)pbuf;



	/* to do: */
@@ -915,7 +915,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf) 
				free_network_nolock(pmlmepriv, pwlan);

			}

			/*re-create ibss*/

			pdev_network = &(adapter->registrypriv.dev_network);

			pdev_network = &adapter->registrypriv.dev_network;

			pibss = adapter->registrypriv.dev_network.MacAddress;

			memcpy(pdev_network, &tgt_network->network,

				r8712_get_wlan_bssid_ex_sz(&tgt_network->network));
@@ -1646,7 +1646,7 @@ static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len) 
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct ht_priv *phtpriv = &pmlmepriv->htpriv;

	struct registry_priv *pregistrypriv = &padapter->registrypriv;

	struct wlan_network *pcur_network = &(pmlmepriv->cur_network);

	struct wlan_network *pcur_network = &pmlmepriv->cur_network;



	if (!phtpriv->ht_option)

		return;