Commit 7ce2b888 authored by Abdun Nihaal's avatar Abdun Nihaal Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: convert rtw_p2p_prov_disc to return void 



rtw_p2p_prov_disc always returns 0 and it's return value is not used.
Convert it to return void.

Suggested-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAbdun Nihaal <abdun.nihaal@gmail.com>
Link: https://lore.kernel.org/r/a6696ce2645a07ddd5b5eca21bcc04b196038e8e.1643466748.git.abdun.nihaal@gmail.com


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

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+5 −7
Original line number Diff line number Diff line
@@ -3171,11 +3171,10 @@ static void rtw_p2p_set_persistent(struct net_device *dev, 
	pr_info("[%s] persistent_supported = %d\n", __func__, pwdinfo->persistent_supported);

}



static int rtw_p2p_prov_disc(struct net_device *dev,

static void rtw_p2p_prov_disc(struct net_device *dev,

			      struct iw_request_info *info,

			      union iwreq_data *wrqu, char *extra)

{

	int ret = 0;

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	u8 peerMAC[ETH_ALEN] = {0x00};
@@ -3201,7 +3200,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, 


	if (pwdinfo->p2p_state == P2P_STATE_NONE) {

		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);

		return ret;

		return;

	} else {

		/*	Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. */

		memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN);
@@ -3225,7 +3224,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, 
		pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_LABEL;

	} else {

		DBG_88E("[%s] Unknown WPS config methodn", __func__);

		return ret;

		return;

	}



	spin_lock_bh(&pmlmepriv->scanned_queue.lock);
@@ -3297,7 +3296,6 @@ static int rtw_p2p_prov_disc(struct net_device *dev, 
	} else {

		DBG_88E("[%s] NOT Found in the Scanning Queue!\n", __func__);

	}

	return ret;

}



/*	This function is used to inform the driver the user had specified the pin code value or pbc */