Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging:r8188eu: remove pm_netdev_open function 



netdev_open and ips_netdrv_open are used instead of pm_netdev_open.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f1ca4d0

drivers/staging/rtl8188eu/core/rtw_pwrctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int rtw_hw_resume(struct adapter *padapter) 
	pwrpriv->bips_processing = true;

	rtw_reset_drv_sw(padapter);



	if (pm_netdev_open(pnetdev, false) != 0) {

	if (ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)) != _SUCCESS) {

		mutex_unlock(&pwrpriv->mutex_lock);

		goto error_exit;

	}

drivers/staging/rtl8188eu/include/osdep_intf.h

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname); 
struct net_device *rtw_init_netdev(struct adapter *padapter);

u16 rtw_recv_select_queue(struct sk_buff *skb);



int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);

int netdev_open(struct net_device *pnetdev);

int ips_netdrv_open(struct adapter *padapter);

void rtw_ips_dev_unload(struct adapter *padapter);

int rtw_ips_pwr_up(struct adapter *padapter);

void rtw_ips_pwr_down(struct adapter *padapter);

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+2 −14
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static bool rtw_monitor_enable; 
module_param_named(monitor_enable, rtw_monitor_enable, bool, 0444);

MODULE_PARM_DESC(monitor_enable, "Enable monitor inferface (default: false)");



static int netdev_open(struct net_device *pnetdev);

static int netdev_close(struct net_device *pnetdev);



static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
@@ -629,7 +628,7 @@ static int _netdev_open(struct net_device *pnetdev) 
	return -1;

}



static 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);
@@ -641,7 +640,7 @@ static int netdev_open(struct net_device *pnetdev) 
	return ret;

}



static int  ips_netdrv_open(struct adapter *padapter)

int  ips_netdrv_open(struct adapter *padapter)

{

	int status = _SUCCESS;
@@ -718,17 +717,6 @@ void rtw_ips_dev_unload(struct adapter *padapter) 
		rtw_hal_deinit(padapter);

}



int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)

{

	int status;



	if (bnormal)

		status = netdev_open(pnetdev);

	else

		status =  (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev))) ? (0) : (-1);

	return status;

}



static int netdev_close(struct net_device *pnetdev)

{

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

drivers/staging/rtl8188eu/os_dep/usb_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int rtw_resume_process(struct adapter *padapter) 
	pwrpriv->bkeepfwalive = false;



	pr_debug("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);

	if (pm_netdev_open(pnetdev, true) != 0) {

	if (netdev_open(pnetdev) != 0) {

		mutex_unlock(&pwrpriv->mutex_lock);

		goto exit;

	}