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

Groups > linux.kernel > #1497453

[PATCH 06/34] staging:r8188eu: change usb_read_port last argument type to (struct *recv_buf)

From Ivan Safonov <insafonov@gmail.com>
Newsgroups linux.kernel
Subject [PATCH 06/34] staging:r8188eu: change usb_read_port last argument type to (struct *recv_buf)
Date 2016-10-07 20:20 +0200
Message-ID <spHUu-4gr-27@gated-at.bofh.it> (permalink)
References <spHB7-3PS-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

To avoid unnecessary typecasts.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
 drivers/staging/rtl8188eu/hal/usb_halinit.c       | 2 +-
 drivers/staging/rtl8188eu/include/usb_ops_linux.h | 2 +-
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c  | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index a09c68f..4d0e3f9 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -999,7 +999,7 @@ u32 rtw_hal_inirp_init(struct adapter *Adapter)
 	/* issue Rx irp to receive data */
 	precvbuf = (struct recv_buf *)precvpriv->precv_buf;
 	for (i = 0; i < NR_RECVBUFF; i++) {
-		if (usb_read_port(Adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf) == false) {
+		if (usb_read_port(Adapter, precvpriv->ff_hwaddr, 0, precvbuf) == false) {
 			RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("usb_rx_init: usb_read_port error\n"));
 			status = _FAIL;
 			goto exit;
diff --git a/drivers/staging/rtl8188eu/include/usb_ops_linux.h b/drivers/staging/rtl8188eu/include/usb_ops_linux.h
index 78d9b6e..4fc2e2d 100644
--- a/drivers/staging/rtl8188eu/include/usb_ops_linux.h
+++ b/drivers/staging/rtl8188eu/include/usb_ops_linux.h
@@ -53,7 +53,7 @@ u8 usb_read8(struct adapter *adapter, u32 addr);
 u16 usb_read16(struct adapter *adapter, u32 addr);
 u32 usb_read32(struct adapter *adapter, u32 addr);
 
-u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
+u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, struct recv_buf *precvbuf);
 void usb_read_port_cancel(struct adapter *adapter);
 
 int usb_write8(struct adapter *adapter, u32 addr, u8 val);
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index b820482..22777b1 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -403,7 +403,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 			RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
 				 ("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"));
 			precvbuf->reuse = true;
-			usb_read_port(adapt, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
+			usb_read_port(adapt, precvpriv->ff_hwaddr, 0, precvbuf);
 			DBG_88E("%s()-%d: RX Warning!\n", __func__, __LINE__);
 		} else {
 			skb_put(precvbuf->pskb, purb->actual_length);
@@ -414,7 +414,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 
 			precvbuf->pskb = NULL;
 			precvbuf->reuse = false;
-			usb_read_port(adapt, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
+			usb_read_port(adapt, precvpriv->ff_hwaddr, 0, precvbuf);
 		}
 	} else {
 		RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete : purb->status(%d) != 0\n", purb->status));
@@ -437,7 +437,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 		case -EOVERFLOW:
 			adapt->HalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
 			precvbuf->reuse = true;
-			usb_read_port(adapt, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
+			usb_read_port(adapt, precvpriv->ff_hwaddr, 0, precvbuf);
 			break;
 		case -EINPROGRESS:
 			DBG_88E("ERROR: URB IS IN PROGRESS!\n");
@@ -448,10 +448,9 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 	}
 }
 
-u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *rmem)
+u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, struct recv_buf *precvbuf)
 {
 	struct urb *purb = NULL;
-	struct recv_buf	*precvbuf = (struct recv_buf *)rmem;
 	struct dvobj_priv	*pdvobj = adapter_to_dvobj(adapter);
 	struct recv_priv	*precvpriv = &adapter->recvpriv;
 	struct usb_device	*pusbd = pdvobj->pusbdev;
-- 
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