From: Ian Abbott <abbotti@mev.co.uk>
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-kernel@vger.kernel.org,
"H Hartley Sweeten" <hsweeten@visionengravers.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"David A. Schleef" <ds@schleef.org>,
"Mori Hess" <fmhess@users.sourceforge.net>,
"Truxton Fulton" <trux@truxton.com>,
linux-staging@lists.linux.dev, linux-pwm@vger.kernel.org
Subject: Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used
Date: Thu, 20 May 2021 14:45:03 +0100 [thread overview]
Message-ID: <c69d39a0-bf9e-857d-93ba-73e2884fa4ad@mev.co.uk> (raw)
In-Reply-To: <20210520122538.3470259-6-lee.jones@linaro.org>
On 20/05/2021 13:25, 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 <abbotti@mev.co.uk>
> Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Thierry Reding <thierry.reding@gmail.com>
> Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: "David A. Schleef" <ds@schleef.org>
> Cc: Mori Hess <fmhess@users.sourceforge.net>
> Cc: Truxton Fulton <trux@truxton.com>
> Cc: linux-staging@lists.linux.dev
> Cc: linux-pwm@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/comedi/drivers/ni_mio_common.c | 9 ---------
> drivers/comedi/drivers/ni_stc.h | 9 ++++++++-
> 2 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/comedi/drivers/ni_mio_common.c b/drivers/comedi/drivers/ni_mio_common.c
> index 4f80a4991f953..37615b4e2c10d 100644
> --- a/drivers/comedi/drivers/ni_mio_common.c
> +++ b/drivers/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/comedi/drivers/ni_stc.h b/drivers/comedi/drivers/ni_stc.h
> index fbc0b753a0f59..0822e65f709dd 100644
> --- a/drivers/comedi/drivers/ni_stc.h
> +++ b/drivers/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 */
>
The "ni_stc.h" header is also included by "ni_mio_cs.c" which doesn't
need `range_ni_E_ao_ext` (admittedly, it was already pulling in a
"tentative" definition of the variable).
Thinking about it, I think it's probably better to move
`range_ni_E_ao_ext` from "ni_mio_common.c" into *both* "ni_atmio.c" and
"ni_pcimio.c" (I think we can live with the small amount of
duplication), and to remove the tentative definition from "ni_stc.h".
--
-=( Ian Abbott <abbotti@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 )=-
next prev parent reply other threads:[~2021-05-20 13:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 12:25 [PATCH 0/6] Rid W=1 warnings from Comedi Lee Jones
2021-05-20 12:25 ` [PATCH 1/6] comedi: comedi_8254: Fix descriptions for 'i8254' and 'iobase' Lee Jones
2021-05-20 12:25 ` [PATCH 2/6] comedi: drivers: jr3_pci: Remove set but unused variable 'min_full_scale' Lee Jones
2021-05-20 13:22 ` Ian Abbott
2021-05-21 7:28 ` Lee Jones
2021-05-20 12:25 ` [PATCH 3/6] comedi: drivers: ni_tio: Fix slightly broken kernel-doc and demote others Lee Jones
2021-05-20 12:25 ` [PATCH 4/6] comedi: drivers: ni_routes: Demote non-conforming kernel-doc headers Lee Jones
2021-05-20 12:25 ` [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used Lee Jones
2021-05-20 12:47 ` Uwe Kleine-König
2021-05-20 13:45 ` Ian Abbott [this message]
2021-05-21 7:26 ` Lee Jones
2021-05-21 7:51 ` Uwe Kleine-König
2021-05-21 11:54 ` Dan Carpenter
2021-05-21 13:53 ` Lee Jones
2021-05-21 14:39 ` Uwe Kleine-König
2021-05-21 16:25 ` Dan Carpenter
2021-05-20 12:25 ` [PATCH 6/6] comedi: drivers: comedi_isadma: Fix misspelling of 'dma_chan1' Lee Jones
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=c69d39a0-bf9e-857d-93ba-73e2884fa4ad@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=ds@schleef.org \
--cc=fmhess@users.sourceforge.net \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=thierry.reding@gmail.com \
--cc=trux@truxton.com \
--cc=u.kleine-koenig@pengutronix.de \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).