On 14/04/2021 19:11, Lee Jones wrote:
... and mark it as __maybe_unused since not all users of the header file reference it.Fixes the following W=1 kernel build warning(s): drivers/staging/comedi/drivers/ni_mio_common.c:163:35: warning: ‘range_ni_E_ao_ext’ defined but not used [-Wunused-const-variable=] Cc: Ian Abbott <abbo...@mev.co.uk> Cc: H Hartley Sweeten <hswee...@visionengravers.com> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: Thierry Reding <thierry.red...@gmail.com> Cc: "Uwe Kleine-König" <u.kleine-koe...@pengutronix.de> Cc: Lee Jones <lee.jo...@linaro.org> Cc: "David A. Schleef" <d...@schleef.org> Cc: Mori Hess <fmh...@users.sourceforge.net> Cc: Truxton Fulton <t...@truxton.com> Cc: linux-stag...@lists.linux.dev Cc: linux-...@vger.kernel.org Signed-off-by: Lee Jones <lee.jo...@linaro.org> --- drivers/staging/comedi/drivers/ni_mio_common.c | 9 --------- drivers/staging/comedi/drivers/ni_stc.h | 9 ++++++++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 4f80a4991f953..37615b4e2c10d 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -160,15 +160,6 @@ static const struct comedi_lrange range_ni_M_ai_628x = { } };-static const struct comedi_lrange range_ni_E_ao_ext = {- 4, { - BIP_RANGE(10), - UNI_RANGE(10), - RANGE_ext(-1, 1), - RANGE_ext(0, 1) - } -}; - static const struct comedi_lrange *const ni_range_lkup[] = { [ai_gain_16] = &range_ni_E_ai, [ai_gain_8] = &range_ni_E_ai_limited, diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index fbc0b753a0f59..0822e65f709dd 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -1137,6 +1137,13 @@ struct ni_private { u8 rgout0_usage; };-static const struct comedi_lrange range_ni_E_ao_ext;+static const struct comedi_lrange __maybe_unused range_ni_E_ao_ext = { + 4, { + BIP_RANGE(10), + UNI_RANGE(10), + RANGE_ext(-1, 1), + RANGE_ext(0, 1) + } +};#endif /* _COMEDI_NI_STC_H */
I think it is better where it is for now with its fellow struct comedi_lrange variables, but feel free to mark it as __maybe_unused.
(Really, the #include "ni_mio_common.c" mess needs sorting out sometime.) -- -=( Ian Abbott <abbo...@mev.co.uk> || MEV Ltd. is a company )=- -=( registered in England & Wales. Regd. number: 02862268. )=- -=( Regd. addr.: S11 & 12 Building 67, Europa Business Park, )=- -=( Bird Hall Lane, STOCKPORT, SK3 0XA, UK. || www.mev.co.uk )=-
