Re: [PATCH 01/19] staging: r8188eu: make rtw_remainder_len() static

[Philipp Hortmann]

On 8/20/22 20:16, Michael Straube wrote:
> The function rtw_remainder_len() is only used in xmit_linux.c.
> Make it static.
>
> Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
> ---
>   drivers/staging/r8188eu/include/xmit_osdep.h | 1 -
>   drivers/staging/r8188eu/os_dep/xmit_linux.c  | 2 +-
>   2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging/r8188eu/include/xmit_osdep.h
> index 130dc06efe73..55347de455c8 100644
> --- a/drivers/staging/r8188eu/include/xmit_osdep.h
> +++ b/drivers/staging/r8188eu/include/xmit_osdep.h
> @@ -37,7 +37,6 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter,
>   void rtw_os_xmit_resource_free(struct adapter *padapter,
>   			       struct xmit_buf *pxmitbuf, u32 free_sz);
>   
> -uint rtw_remainder_len(struct pkt_file *pfile);
>   void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
>   uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen);
>   
> diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c
> index 85ef27735b88..33400a9b08e1 100644
> --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c
> +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c
> @@ -11,7 +11,7 @@
>   #include "../include/osdep_intf.h"
>   #include "../include/usb_osintf.h"
>   
> -uint rtw_remainder_len(struct pkt_file *pfile)
> +static uint rtw_remainder_len(struct pkt_file *pfile)
>   {
>   	return pfile->buf_len - ((size_t)(pfile->cur_addr) -
>   	       (size_t)(pfile->buf_start));

Hi Michael,

cannot apply your patch on top of the patch series(11),
[PATCH] staging: r8188eu: remove ODM_ConfigRFWithHeaderFile()

cat ~/Downloads/\[PATCH\ 01_19\]\ staging\ r8188eu\ make\ 
rtw_remainder_len\(\)\ static.eml | git am
Applying: staging: r8188eu: make rtw_remainder_len() static
error: patch failed: drivers/staging/r8188eu/include/xmit_osdep.h:37
error: drivers/staging/r8188eu/include/xmit_osdep.h: patch does not apply
Patch failed at 0001 staging: r8188eu: make rtw_remainder_len() static

It looks like it should fit but it does not. Have you changed something 
manual in the patch?

Thanks for your support.

Bye Philipp