From: Jes Sorensen Date: Wed, 9 Apr 2014 21:21:08 +0000 (+0200) Subject: staging: rtl8723au: Fold rtw_remainder_len23a() into _rtw_open_pktfile23a() X-Git-Tag: next-20140428~14^2~457 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4f1cb92ae7966a6c65237beabb541af655ff9d9;p=karo-tx-linux.git staging: rtl8723au: Fold rtw_remainder_len23a() into _rtw_open_pktfile23a() Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/include/xmit_osdep.h b/drivers/staging/rtl8723au/include/xmit_osdep.h index 0eca53ece75d..b94e5467c408 100644 --- 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 e1c6fc746233..3cf539a2dd0f 100644 --- a/drivers/staging/rtl8723au/os_dep/xmit_linux.c +++ b/drivers/staging/rtl8723au/os_dep/xmit_linux.c @@ -24,12 +24,6 @@ #include #include -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)