staging: rtl8723au: Fold rtw_remainder_len23a() into _rtw_open_pktfile23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/xmit_osdep.h b/drivers/staging/rtl8723au/include/xmit_osdep.h
index 0eca53ece75d4fface20889819093fb5ad5fe641..b94e5467c40895160b2fb27b67f9d9386da256b6 100644 (file)
--- a/drivers/staging/rtl8723au/include/xmit_osdep.h
+++ b/drivers/staging/rtl8723au/include/xmit_osdep.h
@@ -44,7 +44,6 @@ int rtw_os_xmit_resource_alloc23a(struct rtw_adapter *padapter,
                               struct xmit_buf *pxmitbuf, u32 alloc_sz);
 void rtw_os_xmit_resource_free23a(struct rtw_adapter *padapter,
                               struct xmit_buf *pxmitbuf);
-uint rtw_remainder_len23a(struct pkt_file *pfile);
 void _rtw_open_pktfile23a(struct sk_buff *pkt, struct pkt_file *pfile);
 uint _rtw_pktfile_read23a(struct pkt_file *pfile, u8 *rmem, uint rlen);
 int rtw_endofpktfile23a(struct pkt_file *pfile);

diff --git a/drivers/staging/rtl8723au/os_dep/xmit_linux.c b/drivers/staging/rtl8723au/os_dep/xmit_linux.c
index e1c6fc7462333ec84741e258d63933a1002ba301..3cf539a2dd0f642ada2e2a175ea1ddb54019ce3e 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/xmit_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/xmit_linux.c
@@ -24,12 +24,6 @@
 #include <xmit_osdep.h>
 #include <osdep_intf.h>
 
-uint rtw_remainder_len23a(struct pkt_file *pfile)
-{
-       return pfile->buf_len - ((unsigned long)(pfile->cur_addr) -
-              (unsigned long)(pfile->buf_start));
-}
-
 void _rtw_open_pktfile23a(struct sk_buff *pktptr, struct pkt_file *pfile)
 {
        pfile->pkt = pktptr;
@@ -45,7 +39,8 @@ uint _rtw_pktfile_read23a(struct pkt_file *pfile, u8 *rmem, uint rlen)
 {
        uint    len = 0;
 
-       len =  rtw_remainder_len23a(pfile);
+       len =  pfile->buf_len - ((unsigned long)(pfile->cur_addr) -
+                                (unsigned long)(pfile->buf_start));
        len = (rlen > len) ? len : rlen;
 
        if (rmem)