| Message ID | 1418848615-1745-1-git-send-email-rickard_strandqvist@spectrumdigital.se (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes: > Removes some functions that are not used anywhere: > rtw_hw_resume23a() rtw_hw_suspend23a() > > This was partially found by using a static code analysis program called cppcheck. > > Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> > --- > drivers/staging/rtl8723au/include/osdep_intf.h | 3 - > drivers/staging/rtl8723au/os_dep/usb_intf.c | 100 ------------------------ > 2 files changed, 103 deletions(-) Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> > > diff --git a/drivers/staging/rtl8723au/include/osdep_intf.h b/drivers/staging/rtl8723au/include/osdep_intf.h > index 33afa62..a157eb2 100644 > --- a/drivers/staging/rtl8723au/include/osdep_intf.h > +++ b/drivers/staging/rtl8723au/include/osdep_intf.h > @@ -19,9 +19,6 @@ > #include <osdep_service.h> > #include <drv_types.h> > > -int rtw_hw_suspend23a(struct rtw_adapter *padapter); > -int rtw_hw_resume23a(struct rtw_adapter *padapter); > - > int rtw_init_drv_sw23a(struct rtw_adapter *padapter); > int rtw_free_drv_sw23a(struct rtw_adapter *padapter); > int rtw_reset_drv_sw23a(struct rtw_adapter *padapter); > diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c > index 865743e..42eb90b 100644 > --- a/drivers/staging/rtl8723au/os_dep/usb_intf.c > +++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c > @@ -287,106 +287,6 @@ static void rtw_dev_unload(struct rtw_adapter *padapter) > RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-rtw_dev_unload\n")); > } > > -int rtw_hw_suspend23a(struct rtw_adapter *padapter) > -{ > - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; > - struct net_device *pnetdev = padapter->pnetdev; > - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > - > - if ((!padapter->bup) || (padapter->bDriverStopped) || > - (padapter->bSurpriseRemoved)) { > - DBG_8723A("padapter->bup =%d bDriverStopped =%d bSurpriseRemoved = %d\n", > - padapter->bup, padapter->bDriverStopped, > - padapter->bSurpriseRemoved); > - goto error_exit; > - } > - > - if (padapter) { /* system suspend */ > - LeaveAllPowerSaveMode23a(padapter); > - > - DBG_8723A("==> rtw_hw_suspend23a\n"); > - down(&pwrpriv->lock); > - pwrpriv->bips_processing = true; > - /* padapter->net_closed = true; */ > - /* s1. */ > - if (pnetdev) { > - netif_carrier_off(pnetdev); > - netif_tx_stop_all_queues(pnetdev); > - } > - > - /* s2. */ > - rtw_disassoc_cmd23a(padapter, 500, false); > - > - /* s2-2. indicate disconnect to os */ > - /* rtw_indicate_disconnect23a(padapter); */ > - if (check_fwstate(pmlmepriv, _FW_LINKED)) { > - _clr_fwstate_(pmlmepriv, _FW_LINKED); > - > - rtw_led_control(padapter, LED_CTL_NO_LINK); > - > - rtw_os_indicate_disconnect23a(padapter); > - > - /* donnot enqueue cmd */ > - rtw_lps_ctrl_wk_cmd23a(padapter, > - LPS_CTRL_DISCONNECT, 0); > - } > - /* s2-3. */ > - rtw_free_assoc_resources23a(padapter, 1); > - > - /* s2-4. */ > - rtw_free_network_queue23a(padapter); > - rtw_ips_dev_unload23a(padapter); > - pwrpriv->rf_pwrstate = rf_off; > - pwrpriv->bips_processing = false; > - up(&pwrpriv->lock); > - } else { > - goto error_exit; > - } > - return 0; > -error_exit: > - DBG_8723A("%s, failed\n", __func__); > - return -1; > -} > - > -int rtw_hw_resume23a(struct rtw_adapter *padapter) > -{ > - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; > - struct net_device *pnetdev = padapter->pnetdev; > - > - if (padapter) { /* system resume */ > - DBG_8723A("==> rtw_hw_resume23a\n"); > - down(&pwrpriv->lock); > - pwrpriv->bips_processing = true; > - rtw_reset_drv_sw23a(padapter); > - > - if (pm_netdev_open23a(pnetdev, false)) { > - up(&pwrpriv->lock); > - goto error_exit; > - } > - > - netif_device_attach(pnetdev); > - netif_carrier_on(pnetdev); > - > - if (!rtw_netif_queue_stopped(pnetdev)) > - netif_tx_start_all_queues(pnetdev); > - else > - netif_tx_wake_all_queues(pnetdev); > - > - pwrpriv->bkeepfwalive = false; > - > - pwrpriv->rf_pwrstate = rf_on; > - pwrpriv->bips_processing = false; > - > - up(&pwrpriv->lock); > - } else { > - goto error_exit; > - } > - return 0; > -error_exit: > - DBG_8723A("%s, Open net dev failed\n", __func__); > - return -1; > -} > - > static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) > { > struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Dec 17, 2014 at 09:36:54PM +0100, Rickard Strandqvist wrote: > Removes some functions that are not used anywhere: > rtw_hw_resume23a() rtw_hw_suspend23a() > > This was partially found by using a static code analysis program called cppcheck. > > Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> > Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> > --- > drivers/staging/rtl8723au/include/osdep_intf.h | 3 - > drivers/staging/rtl8723au/os_dep/usb_intf.c | 100 ------------------------ > 2 files changed, 103 deletions(-) No longer applies to my tree :( -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/rtl8723au/include/osdep_intf.h b/drivers/staging/rtl8723au/include/osdep_intf.h index 33afa62..a157eb2 100644 --- a/drivers/staging/rtl8723au/include/osdep_intf.h +++ b/drivers/staging/rtl8723au/include/osdep_intf.h @@ -19,9 +19,6 @@ #include <osdep_service.h> #include <drv_types.h> -int rtw_hw_suspend23a(struct rtw_adapter *padapter); -int rtw_hw_resume23a(struct rtw_adapter *padapter); - int rtw_init_drv_sw23a(struct rtw_adapter *padapter); int rtw_free_drv_sw23a(struct rtw_adapter *padapter); int rtw_reset_drv_sw23a(struct rtw_adapter *padapter); diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c index 865743e..42eb90b 100644 --- a/drivers/staging/rtl8723au/os_dep/usb_intf.c +++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c @@ -287,106 +287,6 @@ static void rtw_dev_unload(struct rtw_adapter *padapter) RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-rtw_dev_unload\n")); } -int rtw_hw_suspend23a(struct rtw_adapter *padapter) -{ - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - struct net_device *pnetdev = padapter->pnetdev; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - - if ((!padapter->bup) || (padapter->bDriverStopped) || - (padapter->bSurpriseRemoved)) { - DBG_8723A("padapter->bup =%d bDriverStopped =%d bSurpriseRemoved = %d\n", - padapter->bup, padapter->bDriverStopped, - padapter->bSurpriseRemoved); - goto error_exit; - } - - if (padapter) { /* system suspend */ - LeaveAllPowerSaveMode23a(padapter); - - DBG_8723A("==> rtw_hw_suspend23a\n"); - down(&pwrpriv->lock); - pwrpriv->bips_processing = true; - /* padapter->net_closed = true; */ - /* s1. */ - if (pnetdev) { - netif_carrier_off(pnetdev); - netif_tx_stop_all_queues(pnetdev); - } - - /* s2. */ - rtw_disassoc_cmd23a(padapter, 500, false); - - /* s2-2. indicate disconnect to os */ - /* rtw_indicate_disconnect23a(padapter); */ - if (check_fwstate(pmlmepriv, _FW_LINKED)) { - _clr_fwstate_(pmlmepriv, _FW_LINKED); - - rtw_led_control(padapter, LED_CTL_NO_LINK); - - rtw_os_indicate_disconnect23a(padapter); - - /* donnot enqueue cmd */ - rtw_lps_ctrl_wk_cmd23a(padapter, - LPS_CTRL_DISCONNECT, 0); - } - /* s2-3. */ - rtw_free_assoc_resources23a(padapter, 1); - - /* s2-4. */ - rtw_free_network_queue23a(padapter); - rtw_ips_dev_unload23a(padapter); - pwrpriv->rf_pwrstate = rf_off; - pwrpriv->bips_processing = false; - up(&pwrpriv->lock); - } else { - goto error_exit; - } - return 0; -error_exit: - DBG_8723A("%s, failed\n", __func__); - return -1; -} - -int rtw_hw_resume23a(struct rtw_adapter *padapter) -{ - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - struct net_device *pnetdev = padapter->pnetdev; - - if (padapter) { /* system resume */ - DBG_8723A("==> rtw_hw_resume23a\n"); - down(&pwrpriv->lock); - pwrpriv->bips_processing = true; - rtw_reset_drv_sw23a(padapter); - - if (pm_netdev_open23a(pnetdev, false)) { - up(&pwrpriv->lock); - goto error_exit; - } - - netif_device_attach(pnetdev); - netif_carrier_on(pnetdev); - - if (!rtw_netif_queue_stopped(pnetdev)) - netif_tx_start_all_queues(pnetdev); - else - netif_tx_wake_all_queues(pnetdev); - - pwrpriv->bkeepfwalive = false; - - pwrpriv->rf_pwrstate = rf_on; - pwrpriv->bips_processing = false; - - up(&pwrpriv->lock); - } else { - goto error_exit; - } - return 0; -error_exit: - DBG_8723A("%s, Open net dev failed\n", __func__); - return -1; -} - static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
Removes some functions that are not used anywhere: rtw_hw_resume23a() rtw_hw_suspend23a() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> --- drivers/staging/rtl8723au/include/osdep_intf.h | 3 - drivers/staging/rtl8723au/os_dep/usb_intf.c | 100 ------------------------ 2 files changed, 103 deletions(-)