| Message ID | 20200826093401.1458456-25-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [01/30] wireless: marvell: mwifiex: pcie: Move tables to the only place they're used | expand |
Lee Jones <lee.jones@linaro.org> wrote: > 'mwifiex_1d_to_wmm_queue' is used in'; main.c, txrx.c and uap_txrx.c > > ... but not used in 14 other source files which include 'wmm.h'. > > Fixes the following W=1 kernel build warning(s): > > In file included from drivers/net/wireless/marvell/mwifiex/init.c:25: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/net/wireless/marvell/mwifiex/cmdevt.c:26: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/net/wireless/marvell/mwifiex/util.c:25: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/net/wireless/marvell/mwifiex/wmm.c:25: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/net/wireless/marvell/mwifiex/11n.c:25: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/net/wireless/marvell/mwifiex/11n_aggr.c:25: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:25: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/net/wireless/marvell/mwifiex/11n.h:25, > from drivers/net/wireless/marvell/mwifiex/scan.c:25: > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > | ^~~~~~~~~~~~~~~~~~~~~~~ > > NB: Many entries - snipped for brevity. > > Cc: Amitkumar Karwar <amitkarwar@gmail.com> > Cc: Ganapathi Bhat <ganapathi.bhat@nxp.com> > Cc: Xinming Hu <huxinming820@gmail.com> > 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: netdev@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Failed to apply: fatal: sha1 information is lacking or useless (drivers/net/wireless/marvell/mwifiex/wmm.h). error: could not build fake ancestor Applying: mwifiex: wmm: Mark 'mwifiex_1d_to_wmm_queue' as __maybe_unused Patch failed at 0001 mwifiex: wmm: Mark 'mwifiex_1d_to_wmm_queue' as __maybe_unused The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested.
On Tue, 01 Sep 2020, Kalle Valo wrote: > Lee Jones <lee.jones@linaro.org> wrote: > > > 'mwifiex_1d_to_wmm_queue' is used in'; main.c, txrx.c and uap_txrx.c > > > > ... but not used in 14 other source files which include 'wmm.h'. > > > > Fixes the following W=1 kernel build warning(s): > > > > In file included from drivers/net/wireless/marvell/mwifiex/init.c:25: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > In file included from drivers/net/wireless/marvell/mwifiex/cmdevt.c:26: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > In file included from drivers/net/wireless/marvell/mwifiex/util.c:25: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > In file included from drivers/net/wireless/marvell/mwifiex/wmm.c:25: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > In file included from drivers/net/wireless/marvell/mwifiex/11n.c:25: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > In file included from drivers/net/wireless/marvell/mwifiex/11n_aggr.c:25: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > In file included from drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:25: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > In file included from drivers/net/wireless/marvell/mwifiex/11n.h:25, > > from drivers/net/wireless/marvell/mwifiex/scan.c:25: > > drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] > > 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > > > NB: Many entries - snipped for brevity. > > > > Cc: Amitkumar Karwar <amitkarwar@gmail.com> > > Cc: Ganapathi Bhat <ganapathi.bhat@nxp.com> > > Cc: Xinming Hu <huxinming820@gmail.com> > > 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: netdev@vger.kernel.org > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > Failed to apply: > > fatal: sha1 information is lacking or useless (drivers/net/wireless/marvell/mwifiex/wmm.h). > error: could not build fake ancestor > Applying: mwifiex: wmm: Mark 'mwifiex_1d_to_wmm_queue' as __maybe_unused > Patch failed at 0001 mwifiex: wmm: Mark 'mwifiex_1d_to_wmm_queue' as __maybe_unused > The copy of the patch that failed is found in: .git/rebase-apply/patch > > Patch set to Changes Requested. I'll rebase everything I have onto -next and see about re-submitting. Thanks.
diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.h b/drivers/net/wireless/marvell/mwifiex/wmm.h index 60bdbb82277a3..58bcd84b050c5 100644 --- a/drivers/net/wireless/marvell/mwifiex/wmm.h +++ b/drivers/net/wireless/marvell/mwifiex/wmm.h @@ -31,7 +31,8 @@ enum ieee_types_wmm_ecw_bitmasks { MWIFIEX_ECW_MAX = (BIT(4) | BIT(5) | BIT(6) | BIT(7)), }; -static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; +static const u16 __maybe_unused +mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; /* * This function retrieves the TID of the given RA list.
'mwifiex_1d_to_wmm_queue' is used in'; main.c, txrx.c and uap_txrx.c ... but not used in 14 other source files which include 'wmm.h'. Fixes the following W=1 kernel build warning(s): In file included from drivers/net/wireless/marvell/mwifiex/init.c:25: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/marvell/mwifiex/cmdevt.c:26: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/marvell/mwifiex/util.c:25: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/marvell/mwifiex/wmm.c:25: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/marvell/mwifiex/11n.c:25: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/marvell/mwifiex/11n_aggr.c:25: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:25: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/marvell/mwifiex/11n.h:25, from drivers/net/wireless/marvell/mwifiex/scan.c:25: drivers/net/wireless/marvell/mwifiex/wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=] 34 | static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; | ^~~~~~~~~~~~~~~~~~~~~~~ NB: Many entries - snipped for brevity. Cc: Amitkumar Karwar <amitkarwar@gmail.com> Cc: Ganapathi Bhat <ganapathi.bhat@nxp.com> Cc: Xinming Hu <huxinming820@gmail.com> 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: netdev@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/net/wireless/marvell/mwifiex/wmm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)