Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1497440

[PATCH 02/34] staging:r8188eu: remove wrappers for rtw_hal_inirp_init function

From Ivan Safonov <insafonov@gmail.com>
Newsgroups linux.kernel
Subject [PATCH 02/34] staging:r8188eu: remove wrappers for rtw_hal_inirp_init function
Date 2016-10-07 20:10 +0200
Message-ID <spHKP-49t-43@gated-at.bofh.it> (permalink)
References <spHB7-3PS-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

There is no reason to use these wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
 drivers/staging/rtl8188eu/include/drv_types.h |  1 -
 drivers/staging/rtl8188eu/os_dep/os_intfs.c   |  6 ++----
 drivers/staging/rtl8188eu/os_dep/usb_intf.c   | 10 ----------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index 32326fd..5eb56b1 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_start)(struct adapter *adapter);
 	void (*intf_stop)(struct adapter *adapter);
 	struct  net_device *pnetdev;
 	struct  net_device *pmondev;
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 40691f1..8d96e51 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -596,8 +596,7 @@ static int _netdev_open(struct net_device *pnetdev)
 			pr_info("can't init mlme_ext_priv\n");
 			goto netdev_open_error;
 		}
-		if (padapter->intf_start)
-			padapter->intf_start(padapter);
+		rtw_hal_inirp_init(padapter);
 
 		rtw_led_control(padapter, LED_CTL_NO_LINK);
 
@@ -658,8 +657,7 @@ static int  ips_netdrv_open(struct adapter *padapter)
 		goto netdev_open_error;
 	}
 
-	if (padapter->intf_start)
-		padapter->intf_start(padapter);
+	rtw_hal_inirp_init(padapter);
 
 	rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);
 	mod_timer(&padapter->mlmepriv.dynamic_chk_timer,
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 68e1e6b..4996332 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -141,15 +141,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
 
 }
 
-static void usb_intf_start(struct adapter *padapter)
-{
-	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_start\n"));
-
-	rtw_hal_inirp_init(padapter);
-
-	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_start\n"));
-}
-
 static void usb_intf_stop(struct adapter *padapter)
 {
 	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));
@@ -366,7 +357,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_start = &usb_intf_start;
 	padapter->intf_stop = &usb_intf_stop;
 
 	/* step read_chip_version */
-- 
2.7.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/34] staging:r8188eu: remove rtw_os_recv_resource_alloc function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:00 +0200
  [PATCH 04/34] staging:r8188eu: remove free_recv_buf_queue_cnt member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:00 +0200
  [PATCH 08/34] staging:r8188eu: remove ff_hwaddr member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:00 +0200
  [PATCH 15/34] staging:r8188eu: remove Antenna_(Lfet|Right) enumeration items Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 29/34] staging:r8188eu: remove free_recvframe_cnt member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 33/34] staging:r8188eu: refactor recvbuf2recvframe function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 07/34] staging:r8188eu: remove (u32 cnt) argument of usb_read_port function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 19/34] staging:r8188eu: refactor rtl88eu_dm_txpower_tracking_callback_thermalmeter function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 03/34] staging:r8188eu: remove pm_netdev_open function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 34/34] staging:r8188eu: remove unnecessary type cast for update_recvframe_phyinfo_88e argument Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 11/34] staging:r8188eu: remove bLedStartToLinkBlinkInProgress and bSWLedCtrl members of LED_871x structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 25/34] staging:r8188eu: remove prhdr local variable from rtw_free_stainfo function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 23/34] staging:r8188eu: remove padapter and free_sz arguments of rtw_os_xmit_resource_free function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 24/34] staging:r8188eu: remove unused function declerations Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 18/34] staging:r8188eu: remove NumTotalRFPath member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 32/34] staging:r8188eu: change poiter type from u8 to void for pallocated_frame_buf member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 02/34] staging:r8188eu: remove wrappers for rtw_hal_inirp_init function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 14/34] staging:r8188eu: remove unused members of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 20/34] staging:r8188eu: remove bTXPowerTrackingInit member of odm_rf_cal structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 22/34] staging:r8188eu: remove rtw_endofpktfile function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200
  [PATCH 16/34] staging:r8188eu: remove rf_chip member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 17/34] staging:r8188eu: remove RF_TYPE_8190P enumeration Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 12/34] staging:r8188eu: remove bLedOpenDrain member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 28/34] staging:r8188eu: remove intf_stop member of adapter structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 06/34] staging:r8188eu: change usb_read_port last argument type to (struct *recv_buf) Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 21/34] staging:r8188eu: remove ANTTEST(ALL|A|B) definitions Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 10/34] staging:r8188eu: remove bRegUseLed member of led_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 26/34] staging:r8188eu: change type of the precv_buf member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 30/34] staging:r8188eu: remove rx_pending_cnt member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 09/34] staging:r8188eu: remove wrappers for LedControl8188eu function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200
  [PATCH 31/34] staging:r8188eu: remove precv_frame_buf member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:50 +0200
  [PATCH 13/34] staging:r8188eu: remove ExternalPA member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:50 +0200
  [PATCH 05/34] staging:r8188eu: remove skb data alignment in r8188eu driver code Ivan Safonov <insafonov@gmail.com> - 2016-10-07 21:10 +0200

csiph-web