| Message ID | 20200826093401.1458456-13-lee.jones@linaro.org |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | Set 3: Rid W=1 warnings in Wireless | expand |
Lee Jones <lee.jones@linaro.org> wrote: > Fixes the following W=1 kernel build warning(s): > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Function parameter or member 'ptr_' not described in 'wmi_buffer_block' > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Excess function parameter 'ptr' description in 'wmi_buffer_block' > > Cc: Maya Erez <merez@codeaurora.org> > Cc: Kalle Valo <kvalo@codeaurora.org> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: linux-wireless@vger.kernel.org > Cc: wil6210@qti.qualcomm.com > Cc: netdev@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Failed to apply: error: patch failed: drivers/net/wireless/ath/wil6210/wmi.c:266 error: drivers/net/wireless/ath/wil6210/wmi.c: patch does not apply stg import: Diff does not apply cleanly Patch set to Changes Requested.
On Wed, 26 Aug 2020, Kalle Valo wrote: > Lee Jones <lee.jones@linaro.org> wrote: > > > Fixes the following W=1 kernel build warning(s): > > > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Function parameter or member 'ptr_' not described in 'wmi_buffer_block' > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Excess function parameter 'ptr' description in 'wmi_buffer_block' > > > > Cc: Maya Erez <merez@codeaurora.org> > > Cc: Kalle Valo <kvalo@codeaurora.org> > > Cc: "David S. Miller" <davem@davemloft.net> > > Cc: Jakub Kicinski <kuba@kernel.org> > > Cc: linux-wireless@vger.kernel.org > > Cc: wil6210@qti.qualcomm.com > > Cc: netdev@vger.kernel.org > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > Failed to apply: > > error: patch failed: drivers/net/wireless/ath/wil6210/wmi.c:266 > error: drivers/net/wireless/ath/wil6210/wmi.c: patch does not apply > stg import: Diff does not apply cleanly > > Patch set to Changes Requested. Are you applying them in order? It may be affected by: wireless: ath: wil6210: wmi: Fix formatting and demote non-conforming function headers I'll also rebase onto the latest -next and resubmit.
On Thu, 27 Aug 2020, Lee Jones wrote: > On Wed, 26 Aug 2020, Kalle Valo wrote: > > > Lee Jones <lee.jones@linaro.org> wrote: > > > > > Fixes the following W=1 kernel build warning(s): > > > > > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Function parameter or member 'ptr_' not described in 'wmi_buffer_block' > > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Excess function parameter 'ptr' description in 'wmi_buffer_block' > > > > > > Cc: Maya Erez <merez@codeaurora.org> > > > Cc: Kalle Valo <kvalo@codeaurora.org> > > > Cc: "David S. Miller" <davem@davemloft.net> > > > Cc: Jakub Kicinski <kuba@kernel.org> > > > Cc: linux-wireless@vger.kernel.org > > > Cc: wil6210@qti.qualcomm.com > > > Cc: netdev@vger.kernel.org > > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > > > Failed to apply: > > > > error: patch failed: drivers/net/wireless/ath/wil6210/wmi.c:266 > > error: drivers/net/wireless/ath/wil6210/wmi.c: patch does not apply > > stg import: Diff does not apply cleanly > > > > Patch set to Changes Requested. > > Are you applying them in order? > > It may be affected by: > > wireless: ath: wil6210: wmi: Fix formatting and demote non-conforming function headers > > I'll also rebase onto the latest -next and resubmit. I just rebased all 3 sets onto the latest -next (next-20200827) without issue. Not sure what problem you're seeing. Did you apply the first set before attempting the second?
Lee Jones <lee.jones@linaro.org> writes: > On Thu, 27 Aug 2020, Lee Jones wrote: > >> On Wed, 26 Aug 2020, Kalle Valo wrote: >> >> > Lee Jones <lee.jones@linaro.org> wrote: >> > >> > > Fixes the following W=1 kernel build warning(s): >> > > >> > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Function >> > > parameter or member 'ptr_' not described in 'wmi_buffer_block' >> > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Excess >> > > function parameter 'ptr' description in 'wmi_buffer_block' >> > > >> > > Cc: Maya Erez <merez@codeaurora.org> >> > > Cc: Kalle Valo <kvalo@codeaurora.org> >> > > Cc: "David S. Miller" <davem@davemloft.net> >> > > Cc: Jakub Kicinski <kuba@kernel.org> >> > > Cc: linux-wireless@vger.kernel.org >> > > Cc: wil6210@qti.qualcomm.com >> > > Cc: netdev@vger.kernel.org >> > > Signed-off-by: Lee Jones <lee.jones@linaro.org> >> > >> > Failed to apply: >> > >> > error: patch failed: drivers/net/wireless/ath/wil6210/wmi.c:266 >> > error: drivers/net/wireless/ath/wil6210/wmi.c: patch does not apply >> > stg import: Diff does not apply cleanly >> > >> > Patch set to Changes Requested. >> >> Are you applying them in order? >> >> It may be affected by: >> >> wireless: ath: wil6210: wmi: Fix formatting and demote >> non-conforming function headers >> >> I'll also rebase onto the latest -next and resubmit. > > I just rebased all 3 sets onto the latest -next (next-20200827) > without issue. Not sure what problem you're seeing. Did you apply > the first set before attempting the second? I can't remember the order, patchwork sorts them based on the order they have been submitted and that's what I usually use. Do note that there's a separate tree for drivers in drivers/net/wireless/ath: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/ And it takes a week or two before patches go to linux-next.
On Thu, 27 Aug 2020, Kalle Valo wrote: > Lee Jones <lee.jones@linaro.org> writes: > > > On Thu, 27 Aug 2020, Lee Jones wrote: > > > >> On Wed, 26 Aug 2020, Kalle Valo wrote: > >> > >> > Lee Jones <lee.jones@linaro.org> wrote: > >> > > >> > > Fixes the following W=1 kernel build warning(s): > >> > > > >> > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Function > >> > > parameter or member 'ptr_' not described in 'wmi_buffer_block' > >> > > drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Excess > >> > > function parameter 'ptr' description in 'wmi_buffer_block' > >> > > > >> > > Cc: Maya Erez <merez@codeaurora.org> > >> > > Cc: Kalle Valo <kvalo@codeaurora.org> > >> > > Cc: "David S. Miller" <davem@davemloft.net> > >> > > Cc: Jakub Kicinski <kuba@kernel.org> > >> > > Cc: linux-wireless@vger.kernel.org > >> > > Cc: wil6210@qti.qualcomm.com > >> > > Cc: netdev@vger.kernel.org > >> > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > >> > > >> > Failed to apply: > >> > > >> > error: patch failed: drivers/net/wireless/ath/wil6210/wmi.c:266 > >> > error: drivers/net/wireless/ath/wil6210/wmi.c: patch does not apply > >> > stg import: Diff does not apply cleanly > >> > > >> > Patch set to Changes Requested. > >> > >> Are you applying them in order? > >> > >> It may be affected by: > >> > >> wireless: ath: wil6210: wmi: Fix formatting and demote > >> non-conforming function headers > >> > >> I'll also rebase onto the latest -next and resubmit. > > > > I just rebased all 3 sets onto the latest -next (next-20200827) > > without issue. Not sure what problem you're seeing. Did you apply > > the first set before attempting the second? > > I can't remember the order, patchwork sorts them based on the order they > have been submitted and that's what I usually use. > > Do note that there's a separate tree for drivers in > drivers/net/wireless/ath: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/ > > And it takes a week or two before patches go to linux-next. Understood. Thank you.
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c index 3a6ee85acf6c7..1439737bbb7b2 100644 --- a/drivers/net/wireless/ath/wil6210/wmi.c +++ b/drivers/net/wireless/ath/wil6210/wmi.c @@ -266,7 +266,7 @@ struct fw_map *wil_find_fw_mapping(const char *section) /** * Check address validity for WMI buffer; remap if needed * @wil: driver data - * @ptr: internal (linker) fw/ucode address + * @ptr_: internal (linker) fw/ucode address * @size: if non zero, validate the block does not * exceed the device memory (bar) *
Fixes the following W=1 kernel build warning(s): drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Function parameter or member 'ptr_' not described in 'wmi_buffer_block' drivers/net/wireless/ath/wil6210/wmi.c:279: warning: Excess function parameter 'ptr' description in 'wmi_buffer_block' Cc: Maya Erez <merez@codeaurora.org> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: linux-wireless@vger.kernel.org Cc: wil6210@qti.qualcomm.com Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)