Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging:r8188eu: remove pm_netdev_open function

netdev_open and ips_netdrv_open are used instead of pm_netdev_open.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ivan Safonov and committed by
Greg Kroah-Hartman
b091c6b6 4f1ca4d0

+6 -17
+1 -1
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
··· 94 94 pwrpriv->bips_processing = true; 95 95 rtw_reset_drv_sw(padapter); 96 96 97 - if (pm_netdev_open(pnetdev, false) != 0) { 97 + if (ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)) != _SUCCESS) { 98 98 mutex_unlock(&pwrpriv->mutex_lock); 99 99 goto error_exit; 100 100 }
+2 -1
drivers/staging/rtl8188eu/include/osdep_intf.h
··· 35 35 struct net_device *rtw_init_netdev(struct adapter *padapter); 36 36 u16 rtw_recv_select_queue(struct sk_buff *skb); 37 37 38 - int pm_netdev_open(struct net_device *pnetdev, u8 bnormal); 38 + int netdev_open(struct net_device *pnetdev); 39 + int ips_netdrv_open(struct adapter *padapter); 39 40 void rtw_ips_dev_unload(struct adapter *padapter); 40 41 int rtw_ips_pwr_up(struct adapter *padapter); 41 42 void rtw_ips_pwr_down(struct adapter *padapter);
+2 -14
drivers/staging/rtl8188eu/os_dep/os_intfs.c
··· 144 144 module_param_named(monitor_enable, rtw_monitor_enable, bool, 0444); 145 145 MODULE_PARM_DESC(monitor_enable, "Enable monitor inferface (default: false)"); 146 146 147 - static int netdev_open(struct net_device *pnetdev); 148 147 static int netdev_close(struct net_device *pnetdev); 149 148 150 149 static void loadparam(struct adapter *padapter, struct net_device *pnetdev) ··· 628 629 return -1; 629 630 } 630 631 631 - static int netdev_open(struct net_device *pnetdev) 632 + int netdev_open(struct net_device *pnetdev) 632 633 { 633 634 int ret; 634 635 struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); ··· 640 641 return ret; 641 642 } 642 643 643 - static int ips_netdrv_open(struct adapter *padapter) 644 + int ips_netdrv_open(struct adapter *padapter) 644 645 { 645 646 int status = _SUCCESS; 646 647 ··· 715 716 /* s5. */ 716 717 if (!padapter->bSurpriseRemoved) 717 718 rtw_hal_deinit(padapter); 718 - } 719 - 720 - int pm_netdev_open(struct net_device *pnetdev, u8 bnormal) 721 - { 722 - int status; 723 - 724 - if (bnormal) 725 - status = netdev_open(pnetdev); 726 - else 727 - status = (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev))) ? (0) : (-1); 728 - return status; 729 719 } 730 720 731 721 static int netdev_close(struct net_device *pnetdev)
+1 -1
drivers/staging/rtl8188eu/os_dep/usb_intf.c
··· 285 285 pwrpriv->bkeepfwalive = false; 286 286 287 287 pr_debug("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive); 288 - if (pm_netdev_open(pnetdev, true) != 0) { 288 + if (netdev_open(pnetdev) != 0) { 289 289 mutex_unlock(&pwrpriv->mutex_lock); 290 290 goto exit; 291 291 }