On Tue, 01 Sep 2020, Kalle Valo wrote: > Lee Jones <lee.jo...@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 <amitkar...@gmail.com> > > Cc: Ganapathi Bhat <ganapathi.b...@nxp.com> > > Cc: Xinming Hu <huxinming...@gmail.com> > > Cc: Kalle Valo <kv...@codeaurora.org> > > Cc: "David S. Miller" <da...@davemloft.net> > > Cc: Jakub Kicinski <k...@kernel.org> > > Cc: linux-wirel...@vger.kernel.org > > Cc: netdev@vger.kernel.org > > Signed-off-by: Lee Jones <lee.jo...@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. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog