Commit 42a18f09 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove unnecessary type cast of rtw_netdev_priv() result 



The type cast
padapter = (struct adapter *)rtw_netdev_priv(dev);
do nothing because type of rtw_netdev_priv() result
is (struct adapter *).

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20201011154715.13445-1-insafonov@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+3 −3
Original line number Diff line number Diff line
@@ -2010,7 +2010,7 @@ int rtw_get_gpio(struct net_device *netdev, int gpio_num) 
{

	u8 value;

	u8 direction;

	struct adapter *adapter = (struct adapter *)rtw_netdev_priv(netdev);

	struct adapter *adapter = rtw_netdev_priv(netdev);

	struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(adapter);



	rtw_ps_deny(adapter, PS_DENY_IOCTL);
@@ -2038,7 +2038,7 @@ int rtw_set_gpio_output_value(struct net_device *netdev, int gpio_num, bool isH 
{

	u8 direction = 0;

	u8 res = -1;

	struct adapter *adapter = (struct adapter *)rtw_netdev_priv(netdev);

	struct adapter *adapter = rtw_netdev_priv(netdev);



	/* Check GPIO is 4~7 */

	if (gpio_num > 7 || gpio_num < 4) {
@@ -2074,7 +2074,7 @@ EXPORT_SYMBOL(rtw_set_gpio_output_value); 


int rtw_config_gpio(struct net_device *netdev, int gpio_num, bool isOutput)

{

	struct adapter *adapter = (struct adapter *)rtw_netdev_priv(netdev);

	struct adapter *adapter = rtw_netdev_priv(netdev);



	if (gpio_num > 7 || gpio_num < 4) {

		DBG_871X("%s The gpio number does not included 4~7.\n", __func__);

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+25 −25
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa 
	int ret = 0;

	u32 wep_key_idx, wep_key_len;

	struct sta_info *psta = NULL, *pbcmc_sta = NULL;

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

	struct adapter *padapter = rtw_netdev_priv(dev);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct security_priv* psecuritypriv =  &(padapter->securitypriv);

	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -847,7 +847,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param 
{

	int ret = 0;

	u32 wep_key_idx, wep_key_len;

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

	struct adapter *padapter = rtw_netdev_priv(dev);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -1039,7 +1039,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, 
	u32 param_len;

	struct ieee_param *param = NULL;

	int ret = 0;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	DBG_871X(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr);
@@ -1149,7 +1149,7 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev, 
static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,

				u8 key_index, bool pairwise, const u8 *mac_addr)

{

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct security_priv *psecuritypriv = &padapter->securitypriv;



	DBG_871X(FUNC_NDEV_FMT" key_index =%d\n", FUNC_NDEV_ARG(ndev), key_index);
@@ -1168,7 +1168,7 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, 
	, bool unicast, bool multicast

	)

{

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct security_priv *psecuritypriv = &padapter->securitypriv;



	DBG_871X(FUNC_NDEV_FMT" key_index =%d, unicast =%d, multicast =%d\n",
@@ -1201,7 +1201,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, 
				struct station_info *sinfo)

{

	int ret = 0;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct sta_info *psta = NULL;

	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1275,7 +1275,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, 
{

	enum nl80211_iftype old_type;

	enum NDIS_802_11_NETWORK_INFRASTRUCTURE networkType;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct wireless_dev *rtw_wdev = padapter->rtw_wdev;

	struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);

	int ret = 0;
@@ -1502,7 +1502,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy 
		goto exit;

	}



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

	padapter = rtw_netdev_priv(ndev);

	pwdev_priv = adapter_wdev_data(padapter);

	pmlmepriv = &padapter->mlmepriv;
@@ -1938,7 +1938,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel 
static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev,

				  struct cfg80211_ibss_params *params)

{

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct ndis_802_11_ssid ndis_ssid;

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -1993,7 +1993,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, 


static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)

{

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct wireless_dev *rtw_wdev = padapter->rtw_wdev;

	enum nl80211_iftype old_type;

	int ret = 0;
@@ -2030,7 +2030,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, 
	int ret = 0;

	enum NDIS_802_11_AUTHENTICATION_MODE authmode;

	struct ndis_802_11_ssid ndis_ssid;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -2214,7 +2214,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, 
static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,

				   u16 reason_code)

{

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

	struct adapter *padapter = rtw_netdev_priv(ndev);



	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@@ -2264,7 +2264,7 @@ static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy, 
				       struct net_device *ndev,

				       bool enabled, int timeout)

{

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct rtw_wdev_priv *rtw_wdev_priv = adapter_wdev_data(padapter);



	DBG_871X(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev),
@@ -2283,7 +2283,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, 
				  struct cfg80211_pmksa *pmksa)

{

	u8 index, blInserted = false;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	u8 strZeroMacAddress[ETH_ALEN] = { 0x00 };
@@ -2336,7 +2336,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, 
				  struct cfg80211_pmksa *pmksa)

{

	u8 index, bMatched = false;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct security_priv *psecuritypriv = &padapter->securitypriv;



	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@@ -2366,7 +2366,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, 
static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy,

				    struct net_device *ndev)

{

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct security_priv *psecuritypriv = &padapter->securitypriv;



	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@@ -2421,7 +2421,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc 
	unsigned char dst_mac_addr[6];

	struct ieee80211_hdr *dot11_hdr;

	struct ieee80211_radiotap_header *rtap_hdr;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);



	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@@ -2691,7 +2691,7 @@ static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy, 
		goto exit;

	}



	adapter = (struct adapter *)rtw_netdev_priv(ndev);

	adapter = rtw_netdev_priv(ndev);

	pwdev_priv = adapter_wdev_data(adapter);



	unregister_netdevice(ndev);
@@ -2757,7 +2757,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, 
								struct cfg80211_ap_settings *settings)

{

	int ret = 0;

	struct adapter *adapter = (struct adapter *)rtw_netdev_priv(ndev);

	struct adapter *adapter = rtw_netdev_priv(ndev);



	DBG_871X(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev),

		settings->hidden_ssid, settings->auth_type);
@@ -2783,7 +2783,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, 
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,

                                struct cfg80211_beacon_data *info)

{

	struct adapter *adapter = (struct adapter *)rtw_netdev_priv(ndev);

	struct adapter *adapter = rtw_netdev_priv(ndev);



	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@@ -2812,7 +2812,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev 
	struct list_head	*phead, *plist;

	u8 updated = false;

	struct sta_info *psta = NULL;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

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

	struct sta_priv *pstapriv = &padapter->stapriv;

	const u8 *mac = params->mac;
@@ -2927,7 +2927,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *nde 
{



	int ret = 0;

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

	struct adapter *padapter = rtw_netdev_priv(ndev);

	struct sta_info *psta = NULL;

	struct sta_priv *pstapriv = &padapter->stapriv;

	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@@ -3080,7 +3080,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, 
		goto exit;

	}



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

	padapter = rtw_netdev_priv(ndev);

	pwdev_priv = adapter_wdev_data(padapter);



	/* cookie generation */
@@ -3152,7 +3152,7 @@ static int cfg80211_rtw_sched_scan_start(struct wiphy *wiphy, 
		struct net_device *dev,

		struct cfg80211_sched_scan_request *request) {



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

	struct adapter *padapter = rtw_netdev_priv(dev);

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

	int ret;
@@ -3468,7 +3468,7 @@ void rtw_wdev_unregister(struct wireless_dev *wdev) 
	if (!(ndev = wdev_to_ndev(wdev)))

		return;



	adapter = (struct adapter *)rtw_netdev_priv(ndev);

	adapter = rtw_netdev_priv(ndev);

	pwdev_priv = adapter_wdev_data(adapter);



	rtw_cfg80211_indicate_scan_done(adapter, true);

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+58 −58

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8723bs/os_dep/os_intfs.c

+6 −6
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void loadparam(struct adapter *padapter, _nic_hdl pnetdev) 


static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)

{

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

	struct adapter *padapter = rtw_netdev_priv(pnetdev);

	struct sockaddr *addr = p;



	if (!padapter->bup) {
@@ -326,7 +326,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) 


static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev)

{

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

	struct adapter *padapter = rtw_netdev_priv(pnetdev);

	struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);

	struct recv_priv *precvpriv = &(padapter->recvpriv);
@@ -889,7 +889,7 @@ int rtw_drv_register_netdev(struct adapter *if1) 
int _netdev_open(struct net_device *pnetdev)

{

	uint status;

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

	struct adapter *padapter = rtw_netdev_priv(pnetdev);

	struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - dev_open\n"));
@@ -961,7 +961,7 @@ int _netdev_open(struct net_device *pnetdev) 
int netdev_open(struct net_device *pnetdev)

{

	int ret;

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

	struct adapter *padapter = rtw_netdev_priv(pnetdev);

	struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);



	if (pwrctrlpriv->bInSuspend) {
@@ -1050,7 +1050,7 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal) 
{

	int status = -1;



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

	struct adapter *padapter = rtw_netdev_priv(pnetdev);



	if (bnormal) {

		if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->hw_init_mutex)) == 0) {
@@ -1066,7 +1066,7 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal) 


static int netdev_close(struct net_device *pnetdev)

{

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

	struct adapter *padapter = rtw_netdev_priv(pnetdev);

	struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - drv_close\n"));

drivers/staging/rtl8723bs/os_dep/xmit_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) 


int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)

{

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

	struct adapter *padapter = rtw_netdev_priv(pnetdev);

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	s32 res = 0;