From: navin patidar <navin.patidar@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org,
navin patidar <navin.patidar@gmail.com>
Subject: [PATCH 23/26] staging: rtl8188eu: Remove pbuddy_adapter from struct adapter
Date: Sun, 1 Jun 2014 17:46:49 +0530 [thread overview]
Message-ID: <1401625013-11208-23-git-send-email-navin.patidar@gmail.com> (raw)
In-Reply-To: <1401625013-11208-1-git-send-email-navin.patidar@gmail.com>
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 19 -------------------
drivers/staging/rtl8188eu/include/drv_types.h | 1 -
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 4 ----
3 files changed, 24 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index 739e250..b8d66fa 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -114,7 +114,6 @@ int ips_leave(struct adapter *padapter)
static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
{
- struct adapter *buddy = adapter->pbuddy_adapter;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
#ifdef CONFIG_88EU_P2P
struct wifidirect_info *pwdinfo = &(adapter->wdinfo);
@@ -136,24 +135,6 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
#endif
goto exit;
- /* consider buddy, if exist */
- if (buddy) {
- struct mlme_priv *b_pmlmepriv = &(buddy->mlmepriv);
- #ifdef CONFIG_88EU_P2P
- struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo);
- #endif
-
- if (check_fwstate(b_pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) ||
- check_fwstate(b_pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) ||
- check_fwstate(b_pmlmepriv, WIFI_AP_STATE) ||
- check_fwstate(b_pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) ||
-#if defined(CONFIG_88EU_P2P)
- !rtw_p2p_chk_state(b_pwdinfo, P2P_STATE_NONE))
-#else
- 0)
-#endif
- goto exit;
- }
ret = true;
exit:
diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index ec9ad4a..1676bb4 100644
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -254,7 +254,6 @@ struct adapter {
* upper application reads it. */
u8 bShowGetP2PState;
#endif
- struct adapter *pbuddy_adapter;
struct mutex hw_init_mutex;
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index c9906e3..2df27c7 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -993,10 +993,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
padapter->rereg_nd_name_priv.old_pnetdev = NULL;
}
- /* clear pbuddystruct adapter to avoid access wrong pointer. */
- if (padapter->pbuddy_adapter != NULL)
- padapter->pbuddy_adapter->pbuddy_adapter = NULL;
-
mutex_destroy(&padapter->hw_init_mutex);
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_free_drv_sw\n"));
--
1.7.10.4
next prev parent reply other threads:[~2014-06-01 12:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-01 12:16 [PATCH 01/26] staging: rtl8188eu: Remove function with empty defination ODM_ResetIQKResult() navin patidar
2014-06-01 12:16 ` [PATCH 02/26] staging :rtl8188eu: Remove HalPhyRf.[h|c] files navin patidar
2014-06-01 12:16 ` [PATCH 03/26] staging: rtl8188eu: Remove header file rtw_version.h navin patidar
2014-06-01 12:16 ` [PATCH 04/26] staging: rtl8188eu: Remove hw_init_mutex from struct rtw_usb_drv navin patidar
2014-06-01 12:16 ` [PATCH 05/26] staging: rtl8188eu: Use unregistering flag from struct usb_interface navin patidar
2014-06-01 12:16 ` [PATCH 06/26] staging : rtl8188eu: Remove drv_registered from struct rtw_usb_drv navin patidar
2014-06-01 12:16 ` [PATCH 07/26] staging: rtl8188eu: Remove " navin patidar
2014-06-01 12:16 ` [PATCH 08/26] staging: rtl8188eu: Use module_usb_driver() macro navin patidar
2014-06-01 12:16 ` [PATCH 09/26] staging: rtl8188eu: Remove function declarations in usb_intf.c navin patidar
2014-06-01 12:16 ` [PATCH 10/26] staging: rtl8188eu: Remove unused stucture defination struct specific_device_id navin patidar
2014-06-01 12:16 ` [PATCH 11/26] staging: rtl8188eu: Remove unused enum navin patidar
2014-06-01 12:16 ` [PATCH 12/26] staging: rtl8188eu: Remove unused members of struct dvobj_priv navin patidar
2014-06-01 12:16 ` [PATCH 13/26] staging: rtl8188eu: Remove usb_suspend_sema from " navin patidar
2014-06-01 12:16 ` [PATCH 14/26] staging: rtl8188eu: Remove usb_alloc_vendor_req_buf " navin patidar
2014-06-01 12:16 ` [PATCH 15/26] staging: rtl8188eu: Remove unused enum _ADAPTER_TYPE navin patidar
2014-06-01 12:16 ` [PATCH 16/26] staging: rtl8188eu: Remove unused enum _IFACE_TYPE navin patidar
2014-06-01 12:16 ` [PATCH 17/26] staging: rtl8188eu: Remove enum driver_state navin patidar
2014-06-01 12:16 ` [PATCH 18/26] staging: rtl8188eu: Remove DriverState from struct adapter navin patidar
2014-06-01 12:16 ` [PATCH 19/26] staging: rtl8188eu: Remove unused function rtl8188e_clone_haldata() navin patidar
2014-06-01 12:16 ` [PATCH 20/26] staging: rtl8188eu: Remove hal_data_sz from struct adapter navin patidar
2014-06-01 12:16 ` [PATCH 21/26] staging: rtl8188eu: Remove unused member variable of " navin patidar
2014-06-01 12:16 ` [PATCH 22/26] staging: rtl8188eu:Remove EepromAddressSize from " navin patidar
2014-06-01 12:16 ` navin patidar [this message]
2014-06-01 12:16 ` [PATCH 24/26] staging: rtl8188eu: Remove bCardDisableWOHSM " navin patidar
2014-06-01 12:16 ` [PATCH 25/26] staging: rtl8188eu: Remove unused function nat25_handle_frame() navin patidar
2014-06-08 14:04 ` [PATCH v2 " navin patidar
2014-06-01 12:16 ` [PATCH 26/26] staging: rtl8188eu: Remove function with empty defination() navin patidar
2014-06-02 9:08 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401625013-11208-23-git-send-email-navin.patidar@gmail.com \
--to=navin.patidar@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome