From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Michael Straube <straube.linux@gmail.com>, gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 01/19] staging: r8188eu: make rtw_remainder_len() static
Date: Sun, 21 Aug 2022 21:57:36 +0200 [thread overview]
Message-ID: <bdbe8b77-4847-196c-a2f9-ccc779ff8d5b@gmail.com> (raw)
In-Reply-To: <20220820181623.12497-2-straube.linux@gmail.com>
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@gmail.com>
> ---
> 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
next prev parent reply other threads:[~2022-08-21 19:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-20 18:16 [PATCH 00/19] staging: r8188eu: migrate os_dep/xmit_linux.c Michael Straube
2022-08-20 18:16 ` [PATCH 01/19] staging: r8188eu: make rtw_remainder_len() static Michael Straube
2022-08-21 19:57 ` Philipp Hortmann [this message]
2022-08-21 20:42 ` Michael Straube
2022-08-20 18:16 ` [PATCH 02/19] staging: r8188eu: make rtw_os_xmit_schedule() static Michael Straube
2022-08-20 18:16 ` [PATCH 03/19] staging: r8188eu: rename rtw_os_xmit_schedule() Michael Straube
2022-08-20 18:16 ` [PATCH 04/19] staging: r8188eu: make rtw_os_xmit_resource_alloc() static Michael Straube
2022-08-20 18:16 ` [PATCH 05/19] staging: r8188eu: rename rtw_os_xmit_resource_alloc() Michael Straube
2022-08-20 18:16 ` [PATCH 06/19] staging: r8188eu: make rtw_os_xmit_resource_free() static Michael Straube
2022-08-20 18:16 ` [PATCH 07/19] staging: r8188eu: rename rtw_os_xmit_resource_free() Michael Straube
2022-08-20 18:16 ` [PATCH 08/19] staging: r8188eu: make _rtw_open_pktfile() static Michael Straube
2022-08-20 18:16 ` [PATCH 09/19] staging: r8188eu: rename _rtw_open_pktfile() Michael Straube
2022-08-20 18:16 ` [PATCH 10/19] staging: r8188eu: make _rtw_pktfile_read() static Michael Straube
2022-08-20 18:16 ` [PATCH 11/19] staging: r8188eu: rename _rtw_pktfile_read() Michael Straube
2022-08-20 18:16 ` [PATCH 12/19] staging: r8188eu: remove unnecessary initialization to zero Michael Straube
2022-08-20 18:16 ` [PATCH 13/19] staging: r8188eu: move struct pkt_file to rtw_xmit.h Michael Straube
2022-08-20 18:16 ` [PATCH 14/19] staging: r8188eu: move rtw_os_xmit_complete() to rtw_xmit.c Michael Straube
2022-08-20 18:16 ` [PATCH 15/19] staging: r8188eu: rename rtw_os_xmit_complete() Michael Straube
2022-08-20 18:16 ` [PATCH 16/19] staging: r8188eu: make rtw_os_pkt_complete() static Michael Straube
2022-08-20 18:16 ` [PATCH 17/19] staging: r8188eu: rename rtw_os_pkt_complete() Michael Straube
2022-08-20 18:16 ` [PATCH 18/19] staging: r8188eu: remove os_dep/xmit_linux.c Michael Straube
2022-08-20 18:16 ` [PATCH 19/19] staging: r8188eu: remove xmit_osdep.h Michael Straube
2022-08-22 17:58 ` [PATCH 00/19] staging: r8188eu: migrate os_dep/xmit_linux.c Philipp Hortmann
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=bdbe8b77-4847-196c-a2f9-ccc779ff8d5b@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/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