From: Ivan Safonov <insafonov@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kyle Kuffermann <kyle.kuffermann@gmail.com>,
Alexey Khoroshilov <khoroshilov@ispras.ru>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: Ivan Safonov <insafonov@gmail.com>
Subject: [PATCH 28/34] staging:r8188eu: remove intf_stop member of adapter structure
Date: Sat, 8 Oct 2016 01:01:27 +0700 [thread overview]
Message-ID: <1475863293-27587-28-git-send-email-insafonov@gmail.com> (raw)
In-Reply-To: <1475863293-27587-1-git-send-email-insafonov@gmail.com>
call usb_intf_stop directly.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/include/drv_types.h | 1 -
drivers/staging/rtl8188eu/include/hal_intf.h | 1 +
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 3 +--
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 7 ++-----
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index 5eb56b1..e86419e 100644
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -156,7 +156,6 @@ struct adapter {
u8 hw_init_completed;
void *cmdThread;
- void (*intf_stop)(struct adapter *adapter);
struct net_device *pnetdev;
struct net_device *pmondev;
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index fa032b0..e1114a9 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -190,6 +190,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter,
u32 rtw_hal_inirp_init(struct adapter *padapter);
void rtw_hal_inirp_deinit(struct adapter *padapter);
+void usb_intf_stop(struct adapter *padapter);
s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtw_hal_mgnt_xmit(struct adapter *padapter,
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index c933883..8fc3fad 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -709,8 +709,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);
- if (padapter->intf_stop)
- padapter->intf_stop(padapter);
+ usb_intf_stop(padapter);
/* s5. */
if (!padapter->bSurpriseRemoved)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 94dac53..c6316ff 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -141,7 +141,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
}
-static void usb_intf_stop(struct adapter *padapter)
+void usb_intf_stop(struct adapter *padapter)
{
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));
@@ -174,8 +174,7 @@ static void rtw_dev_unload(struct adapter *padapter)
if (padapter->xmitpriv.ack_tx)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
/* s3. */
- if (padapter->intf_stop)
- padapter->intf_stop(padapter);
+ usb_intf_stop(padapter);
/* s4. */
if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
rtw_stop_drv_threads(padapter);
@@ -357,8 +356,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
if (!padapter->HalData)
DBG_88E("cant not alloc memory for HAL DATA\n");
- padapter->intf_stop = &usb_intf_stop;
-
/* step read_chip_version */
rtw_hal_read_chip_version(padapter);
--
2.7.3
next prev parent reply other threads:[~2016-10-07 18:14 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 18:01 [PATCH 01/34] staging:r8188eu: remove rtw_os_recv_resource_alloc function Ivan Safonov
2016-10-07 18:01 ` [PATCH 02/34] staging:r8188eu: remove wrappers for rtw_hal_inirp_init function Ivan Safonov
2016-10-07 18:01 ` [PATCH 03/34] staging:r8188eu: remove pm_netdev_open function Ivan Safonov
2016-10-07 18:01 ` [PATCH 04/34] staging:r8188eu: remove free_recv_buf_queue_cnt member of recv_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 05/34] staging:r8188eu: remove skb data alignment in r8188eu driver code Ivan Safonov
2016-10-07 18:01 ` [PATCH 06/34] staging:r8188eu: change usb_read_port last argument type to (struct *recv_buf) Ivan Safonov
2016-10-07 18:01 ` [PATCH 07/34] staging:r8188eu: remove (u32 cnt) argument of usb_read_port function Ivan Safonov
2016-10-07 18:01 ` [PATCH 08/34] staging:r8188eu: remove ff_hwaddr member of recv_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 09/34] staging:r8188eu: remove wrappers for LedControl8188eu function Ivan Safonov
2016-10-07 18:01 ` [PATCH 10/34] staging:r8188eu: remove bRegUseLed member of led_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 11/34] staging:r8188eu: remove bLedStartToLinkBlinkInProgress and bSWLedCtrl members of LED_871x structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 12/34] staging:r8188eu: remove bLedOpenDrain member of hal_data_8188e structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 13/34] staging:r8188eu: remove ExternalPA " Ivan Safonov
2016-10-07 18:01 ` [PATCH 14/34] staging:r8188eu: remove unused members " Ivan Safonov
2016-10-07 18:01 ` [PATCH 15/34] staging:r8188eu: remove Antenna_(Lfet|Right) enumeration items Ivan Safonov
2016-10-07 18:01 ` [PATCH 16/34] staging:r8188eu: remove rf_chip member of hal_data_8188e structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 17/34] staging:r8188eu: remove RF_TYPE_8190P enumeration Ivan Safonov
2016-10-07 18:01 ` [PATCH 18/34] staging:r8188eu: remove NumTotalRFPath member of hal_data_8188e structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 19/34] staging:r8188eu: refactor rtl88eu_dm_txpower_tracking_callback_thermalmeter function Ivan Safonov
2016-10-07 18:01 ` [PATCH 20/34] staging:r8188eu: remove bTXPowerTrackingInit member of odm_rf_cal structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 21/34] staging:r8188eu: remove ANTTEST(ALL|A|B) definitions Ivan Safonov
2016-10-07 18:01 ` [PATCH 22/34] staging:r8188eu: remove rtw_endofpktfile function Ivan Safonov
2016-10-07 18:01 ` [PATCH 23/34] staging:r8188eu: remove padapter and free_sz arguments of rtw_os_xmit_resource_free function Ivan Safonov
2016-10-07 18:01 ` [PATCH 24/34] staging:r8188eu: remove unused function declerations Ivan Safonov
2016-10-07 18:01 ` [PATCH 25/34] staging:r8188eu: remove prhdr local variable from rtw_free_stainfo function Ivan Safonov
2016-10-07 18:01 ` [PATCH 26/34] staging:r8188eu: change type of the precv_buf member of recv_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 27/34] staging:r8188eu: remove pallocated_recv_buf member of the " Ivan Safonov
2016-10-07 18:01 ` Ivan Safonov [this message]
2016-10-07 18:01 ` [PATCH 29/34] staging:r8188eu: remove free_recvframe_cnt member of " Ivan Safonov
2016-10-07 18:01 ` [PATCH 30/34] staging:r8188eu: remove rx_pending_cnt " Ivan Safonov
2016-10-07 18:01 ` [PATCH 31/34] staging:r8188eu: remove precv_frame_buf " Ivan Safonov
2016-10-07 18:01 ` [PATCH 32/34] staging:r8188eu: change poiter type from u8 to void for pallocated_frame_buf " Ivan Safonov
2016-10-07 18:01 ` [PATCH 33/34] staging:r8188eu: refactor recvbuf2recvframe function Ivan Safonov
2016-10-07 18:01 ` [PATCH 34/34] staging:r8188eu: remove unnecessary type cast for update_recvframe_phyinfo_88e argument Ivan Safonov
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=1475863293-27587-28-git-send-email-insafonov@gmail.com \
--to=insafonov@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=khoroshilov@ispras.ru \
--cc=kyle.kuffermann@gmail.com \
--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
all inboxes | Powered by JetHome®