* [PATCH] staging: rtl8723au: os_dep: usb_intf.c: Remove some unused functions
@ 2014-12-17 20:36 Rickard Strandqvist
2014-12-17 20:59 ` Jes Sorensen
2015-01-17 21:55 ` Greg Kroah-Hartman
0 siblings, 2 replies; 3+ messages in thread
From: Rickard Strandqvist @ 2014-12-17 20:36 UTC (permalink / raw)
To: Larry Finger, Jes Sorensen
Cc: Rickard Strandqvist, Greg Kroah-Hartman, linux-wireless, devel,
linux-kernel
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(-)
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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] staging: rtl8723au: os_dep: usb_intf.c: Remove some unused functions
2014-12-17 20:36 [PATCH] staging: rtl8723au: os_dep: usb_intf.c: Remove some unused functions Rickard Strandqvist
@ 2014-12-17 20:59 ` Jes Sorensen
2015-01-17 21:55 ` Greg Kroah-Hartman
1 sibling, 0 replies; 3+ messages in thread
From: Jes Sorensen @ 2014-12-17 20:59 UTC (permalink / raw)
To: Rickard Strandqvist
Cc: Larry Finger, Greg Kroah-Hartman, linux-wireless, devel,
linux-kernel
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);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] staging: rtl8723au: os_dep: usb_intf.c: Remove some unused functions
2014-12-17 20:36 [PATCH] staging: rtl8723au: os_dep: usb_intf.c: Remove some unused functions Rickard Strandqvist
2014-12-17 20:59 ` Jes Sorensen
@ 2015-01-17 21:55 ` Greg Kroah-Hartman
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2015-01-17 21:55 UTC (permalink / raw)
To: Rickard Strandqvist
Cc: Larry Finger, Jes Sorensen, linux-wireless, devel, linux-kernel
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 :(
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-17 22:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-17 20:36 [PATCH] staging: rtl8723au: os_dep: usb_intf.c: Remove some unused functions Rickard Strandqvist
2014-12-17 20:59 ` Jes Sorensen
2015-01-17 21:55 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).