mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 10/22] staging: rtl8188eu: Remove function _rtw_write_port()
Date: Wed, 11 Jun 2014 22:51:29 +0530	[thread overview]
Message-ID: <1402507301-3722-10-git-send-email-navin.patidar@gmail.com> (raw)
In-Reply-To: <1402507301-3722-1-git-send-email-navin.patidar@gmail.com>

_rtw_write_port() is a wrapper function, being used to call usb_write_port().
Call usb_write_port() directly and drop _rtw_write_port().

Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
 drivers/staging/rtl8188eu/core/rtw_io.c        |   16 ----------------
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c |    4 ++--
 drivers/staging/rtl8188eu/hal/usb_ops_linux.c  |    1 -
 drivers/staging/rtl8188eu/include/rtw_io.h     |    6 +-----
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_io.c b/drivers/staging/rtl8188eu/core/rtw_io.c
index 627a852..a0a395c 100644
--- a/drivers/staging/rtl8188eu/core/rtw_io.c
+++ b/drivers/staging/rtl8188eu/core/rtw_io.c
@@ -126,22 +126,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
 	return RTW_STATUS_CODE(ret);
 }
 
-u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
-{
-	u32 (*_write_port)(struct adapter *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
-	struct io_priv *pio_priv = &adapter->iopriv;
-	struct	intf_hdl		*pintfhdl = &(pio_priv->intf);
-	u32 ret = _SUCCESS;
-
-
-	_write_port = pintfhdl->io_ops._write_port;
-
-	ret = _write_port(adapter, addr, cnt, pmem);
-
-
-	return ret;
-}
-
 void _rtw_write_port_cancel(struct adapter *adapter)
 {
 	void (*_write_port_cancel)(struct adapter *pintfhdl);
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
index 3476f88..4bc2ce0 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
@@ -397,7 +397,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struct xmit_frame *pxmitframe)
 		}
 		ff_hwaddr = rtw_get_ff_hwaddr(pxmitframe);
 
-		inner_ret = rtw_write_port(adapt, ff_hwaddr, w_sz, (unsigned char *)pxmitbuf);
+		inner_ret = usb_write_port(adapt, ff_hwaddr, w_sz, (unsigned char *)pxmitbuf);
 
 		rtw_count_tx_stats(adapt, pxmitframe, sz);
 
@@ -608,7 +608,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp
 
 	/* 3 4. write xmit buffer to USB FIFO */
 	ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe);
-	rtw_write_port(adapt, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf);
+	usb_write_port(adapt, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf);
 
 	/* 3 5. update statisitc */
 	pbuf_tail -= (pfirstframe->agg_num * TXDESC_SIZE);
diff --git a/drivers/staging/rtl8188eu/hal/usb_ops_linux.c b/drivers/staging/rtl8188eu/hal/usb_ops_linux.c
index 95f6c10..02ab541 100644
--- a/drivers/staging/rtl8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/hal/usb_ops_linux.c
@@ -672,6 +672,5 @@ void rtl8188eu_set_intf_ops(struct _io_ops	*pops)
 	pops->_write8 = &usb_write8;
 	pops->_write16 = &usb_write16;
 	pops->_write32 = &usb_write32;
-	pops->_write_port = &usb_write_port;
 	pops->_write_port_cancel = &usb_write_port_cancel;
 }
diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
index 0ca46e8..4f24092 100644
--- a/drivers/staging/rtl8188eu/include/rtw_io.h
+++ b/drivers/staging/rtl8188eu/include/rtw_io.h
@@ -50,8 +50,6 @@ struct _io_ops {
 	int (*_write8)(struct adapter *pintfhdl, u32 addr, u8 val);
 	int (*_write16)(struct adapter *pintfhdl, u32 addr, u16 val);
 	int (*_write32)(struct adapter *pintfhdl, u32 addr, u32 val);
-	u32 (*_write_port)(struct adapter *pintfhdl, u32 addr, u32 cnt,
-			   u8 *pmem);
 	void (*_write_port_cancel)(struct adapter *pintfhdl);
 };
 
@@ -95,7 +93,7 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);
 int _rtw_write32(struct adapter *adapter, u32 addr, u32 val);
 int usb_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata);
 
-u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
+u32 usb_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
 void _rtw_write_port_cancel(struct adapter *adapter);
 
 #define rtw_read8(adapter, addr) _rtw_read8((adapter), (addr))
@@ -108,8 +106,6 @@ void _rtw_write_port_cancel(struct adapter *adapter);
 	_rtw_write16((adapter), (addr), (val))
 #define  rtw_write32(adapter, addr, val)				\
 	_rtw_write32((adapter), (addr), (val))
-#define rtw_write_port(adapter, addr, cnt, mem)				\
-	_rtw_write_port((adapter), (addr), (cnt), (mem))
 #define rtw_write_port_cancel(adapter) _rtw_write_port_cancel((adapter))
 
 
-- 
1.7.10.4


  parent reply	other threads:[~2014-06-11 17:23 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-11 17:21 [PATCH 01/22] staging: rtl8188eu: rtw_io.c: Remove unused function _rtw_write8_async() navin patidar
2014-06-11 17:21 ` [PATCH 02/22] staging: rtl8188eu: rtw_io.c: Remove unused function rtw_write16_async() navin patidar
2014-06-11 17:21 ` [PATCH 03/22] staging: rtl8188eu: rtw_io.c: Remove unused function _rtw_write32_async() navin patidar
2014-06-11 17:21 ` [PATCH 04/22] staging: rtl8188eu: rtw_io.c: Remove unused function _rtw_write_port_and_wait() navin patidar
2014-06-11 17:21 ` [PATCH 05/22] staging: rtl8188eu: rtw_io.h: Remove unused function declarations navin patidar
2014-06-11 17:21 ` [PATCH 06/22] staging: rtl8188eu: Instead of intf_hdl pass adapter in read & write functions navin patidar
2014-06-12  7:43   ` Dan Carpenter
2014-06-12 10:22     ` navin patidar
2014-06-12 13:57       ` Dan Carpenter
2014-06-11 17:21 ` [PATCH 07/22] staging: rtl8188eu: Remove function _rtw_writeN() navin patidar
2014-06-11 17:21 ` [PATCH 08/22] staging: rtl8188eu: Remove function _rtw_read_port() navin patidar
2014-06-11 17:21 ` [PATCH 09/22] staging: rtl8188eu: Remove function _rtw_read_port_cancel() navin patidar
2014-06-11 17:21 ` navin patidar [this message]
2014-06-11 17:21 ` [PATCH 11/22] staging: rtl8188eu: Remove function _rtw_write_port_cancel() navin patidar
2014-06-11 17:21 ` [PATCH 12/22] staging: rtl8188eu: Remove function _rtw_write32() navin patidar
2014-06-11 17:21 ` [PATCH 13/22] staging: rtl8188eu: Remove function _rtw_write16() navin patidar
2014-06-11 17:21 ` [PATCH 14/22] staging: rtl8188eu: Remove function _rtw_write8() navin patidar
2014-06-11 17:21 ` [PATCH 15/22] staging: rtl8188eu: Remove function _rtw_read32() navin patidar
2014-06-11 17:21 ` [PATCH 16/22] staging: rtl8188eu: Remove function _rtw_read16() navin patidar
2014-06-11 17:21 ` [PATCH 17/22] staging: rtl8188eu: Remove function _rtw_read8() navin patidar
2014-06-11 17:21 ` [PATCH 18/22] staging: rtl8188eu: Remove functions initialize rtw_[read,write] wrapper navin patidar
2014-06-11 17:21 ` [PATCH 19/22] staging: rtl8188eu: usb_ops_linux.h: Remove unused function declarations navin patidar
2014-06-11 17:21 ` [PATCH 20/22] staging: rtl8188eu: rtw_io.h: Remove unused structures and macros navin patidar
2014-06-11 17:21 ` [PATCH 21/22] staging: rtl8188eu: Move usb_[read,write]() declarations to usb_ops_linux.h navin patidar
2014-06-11 17:21 ` [PATCH 22/22] staging: rtl8188eu: Remove empty files rtw_io.[c,h] navin patidar

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=1402507301-3722-10-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