* [PATCH 0/6] Rid W=1 warnings from Comedi
@ 2021-05-20 12:25 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
0 siblings, 1 reply; 10+ messages in thread
From: Lee Jones @ 2021-05-20 12:25 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alexander A. Klimov, Anders Blomdell, Comedi,
David A. Schleef, Greg Kroah-Hartman, Herman.Bruyninckx,
H Hartley Sweeten, Ian Abbott, J.P. Mellor, Klaas.Gadeyne,
linux-pwm, linux-staging, Mori Hess, Spencer E. Olson,
Thierry Reding, Truxton Fulton, Uwe Kleine-König,
Wim.Meeussen
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
Lee Jones (6):
comedi: comedi_8254: Fix descriptions for 'i8254' and 'iobase'
comedi: drivers: jr3_pci: Remove set but unused variable
'min_full_scale'
comedi: drivers: ni_tio: Fix slightly broken kernel-doc and demote
others
comedi: drivers: ni_routes: Demote non-conforming kernel-doc headers
comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it
is used
comedi: drivers: comedi_isadma: Fix misspelling of 'dma_chan1'
drivers/comedi/drivers/comedi_8254.c | 3 ++-
drivers/comedi/drivers/comedi_isadma.c | 2 +-
drivers/comedi/drivers/jr3_pci.c | 3 +--
drivers/comedi/drivers/ni_mio_common.c | 9 ---------
drivers/comedi/drivers/ni_routes.c | 6 +++---
drivers/comedi/drivers/ni_stc.h | 9 ++++++++-
drivers/comedi/drivers/ni_tio.c | 12 ++++++------
7 files changed, 21 insertions(+), 23 deletions(-)
Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de>
Cc: Anders Blomdell <anders.blomdell@control.lth.se>
Cc: Comedi <comedi@comedi.org>
Cc: "David A. Schleef" <ds@schleef.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herman.Bruyninckx@mech.kuleuven.ac.be
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: "J.P. Mellor" <jpmellor@rose-hulman.edu>
Cc: Klaas.Gadeyne@mech.kuleuven.ac.be
Cc: Lee Jones <lee.jones@linaro.org>
Cc: linux-pwm@vger.kernel.org
Cc: linux-staging@lists.linux.dev
Cc: Mori Hess <fmhess@users.sourceforge.net>
Cc: "Spencer E. Olson" <olsonse@umich.edu>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Truxton Fulton <trux@truxton.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Wim.Meeussen@mech.kuleuven.ac.be
--
2.31.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 2021-05-20 12:25 [PATCH 0/6] Rid W=1 warnings from Comedi Lee Jones @ 2021-05-20 12:25 ` Lee Jones 2021-05-20 12:47 ` Uwe Kleine-König 2021-05-20 13:45 ` Ian Abbott 0 siblings, 2 replies; 10+ messages in thread From: Lee Jones @ 2021-05-20 12:25 UTC (permalink / raw) To: lee.jones Cc: linux-kernel, Ian Abbott, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, Uwe Kleine-König, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm ... 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 */ -- 2.31.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 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 1 sibling, 0 replies; 10+ messages in thread From: Uwe Kleine-König @ 2021-05-20 12:47 UTC (permalink / raw) To: Lee Jones Cc: linux-kernel, Ian Abbott, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm [-- Attachment #1: Type: text/plain, Size: 2907 bytes --] Hello Lee, On Thu, May 20, 2021 at 01:25:37PM +0100, 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) > + } > +}; When you send this patch some time ago I wrote: | I think a downside of this solution is that range_ni_E_ao_ext might be | duplicated in the object files. (Ditto for the status quo BTW.) | | I think the right approach to fix the compiler warning and the | duplication is to declare range_ni_E_ao_ext external in the header and | keep the definition in ni_mio_common.c. You didn't reply to that, so maybe you missed it? Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ | [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 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 2021-05-21 7:26 ` Lee Jones 1 sibling, 1 reply; 10+ messages in thread From: Ian Abbott @ 2021-05-20 13:45 UTC (permalink / raw) To: Lee Jones Cc: linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, Uwe Kleine-König, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm 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 )=- ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 2021-05-20 13:45 ` Ian Abbott @ 2021-05-21 7:26 ` Lee Jones 2021-05-21 7:51 ` Uwe Kleine-König 2021-05-21 11:54 ` Dan Carpenter 0 siblings, 2 replies; 10+ messages in thread From: Lee Jones @ 2021-05-21 7:26 UTC (permalink / raw) To: Ian Abbott Cc: linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, Uwe Kleine-König, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm On Thu, 20 May 2021, Ian Abbott wrote: > 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". Happy to rework. Am I taking this or Uwe's suggestion? -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 2021-05-21 7:26 ` Lee Jones @ 2021-05-21 7:51 ` Uwe Kleine-König 2021-05-21 11:54 ` Dan Carpenter 1 sibling, 0 replies; 10+ messages in thread From: Uwe Kleine-König @ 2021-05-21 7:51 UTC (permalink / raw) To: Lee Jones Cc: Ian Abbott, linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm [-- Attachment #1: Type: text/plain, Size: 3544 bytes --] On Fri, May 21, 2021 at 08:26:35AM +0100, Lee Jones wrote: > On Thu, 20 May 2021, Ian Abbott wrote: > > > 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". > > Happy to rework. > > Am I taking this or Uwe's suggestion? uah, maybe the first step is to not include ni_mio_common.c from other c files. That should save some more duplicated bytes than only range_ni_E_ao_ext ... Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ | [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 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 1 sibling, 2 replies; 10+ messages in thread From: Dan Carpenter @ 2021-05-21 11:54 UTC (permalink / raw) To: Lee Jones Cc: Ian Abbott, linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, Uwe Kleine-König, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm On Fri, May 21, 2021 at 08:26:35AM +0100, Lee Jones wrote: > On Thu, 20 May 2021, Ian Abbott wrote: > > > 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". > > Happy to rework. > > Am I taking this or Uwe's suggestion? You should probably take Ian's suggestion because he is the maintainer and I really doubt Uwe's will build. :P But Uwe is right that including .c files is ugly. regards, dan carpenter ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 2021-05-21 11:54 ` Dan Carpenter @ 2021-05-21 13:53 ` Lee Jones 2021-05-21 14:39 ` Uwe Kleine-König 1 sibling, 0 replies; 10+ messages in thread From: Lee Jones @ 2021-05-21 13:53 UTC (permalink / raw) To: Dan Carpenter Cc: Ian Abbott, linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, Uwe Kleine-König, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm On Fri, 21 May 2021, Dan Carpenter wrote: > On Fri, May 21, 2021 at 08:26:35AM +0100, Lee Jones wrote: > > On Thu, 20 May 2021, Ian Abbott wrote: > > > > > 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". > > > > Happy to rework. > > > > Am I taking this or Uwe's suggestion? > > You should probably take Ian's suggestion because he is the maintainer I think you missed my point. Now there are 2 options; I'd like Ian to tell me which one to implement. > and I really doubt Uwe's will build. :P But Uwe is right that > including .c files is ugly. No one is disputing that. :) -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 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 1 sibling, 1 reply; 10+ messages in thread From: Uwe Kleine-König @ 2021-05-21 14:39 UTC (permalink / raw) To: Dan Carpenter Cc: Lee Jones, Ian Abbott, linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm [-- Attachment #1: Type: text/plain, Size: 4709 bytes --] On Fri, May 21, 2021 at 02:54:31PM +0300, Dan Carpenter wrote: > On Fri, May 21, 2021 at 08:26:35AM +0100, Lee Jones wrote: > > On Thu, 20 May 2021, Ian Abbott wrote: > > > > > 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". > > > > Happy to rework. > > > > Am I taking this or Uwe's suggestion? > > You should probably take Ian's suggestion because he is the maintainer > and I really doubt Uwe's will build. :P But Uwe is right that > including .c files is ugly. I just tried diff --git a/drivers/comedi/drivers/ni_mio_common.c b/drivers/comedi/drivers/ni_mio_common.c index 4f80a4991f95..3b37c8b00ecd 100644 --- a/drivers/comedi/drivers/ni_mio_common.c +++ b/drivers/comedi/drivers/ni_mio_common.c @@ -160,7 +160,7 @@ static const struct comedi_lrange range_ni_M_ai_628x = { } }; -static const struct comedi_lrange range_ni_E_ao_ext = { +const struct comedi_lrange range_ni_E_ao_ext = { 4, { BIP_RANGE(10), UNI_RANGE(10), diff --git a/drivers/comedi/drivers/ni_stc.h b/drivers/comedi/drivers/ni_stc.h index fbc0b753a0f5..026d215f2ef2 100644 --- a/drivers/comedi/drivers/ni_stc.h +++ b/drivers/comedi/drivers/ni_stc.h @@ -1137,6 +1137,6 @@ struct ni_private { u8 rgout0_usage; }; -static const struct comedi_lrange range_ni_E_ao_ext; +extern const struct comedi_lrange range_ni_E_ao_ext; #endif /* _COMEDI_NI_STC_H */ and it built for me. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ | [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used 2021-05-21 14:39 ` Uwe Kleine-König @ 2021-05-21 16:25 ` Dan Carpenter 0 siblings, 0 replies; 10+ messages in thread From: Dan Carpenter @ 2021-05-21 16:25 UTC (permalink / raw) To: Uwe Kleine-König Cc: Lee Jones, Ian Abbott, linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman, Thierry Reding, David A. Schleef, Mori Hess, Truxton Fulton, linux-staging, linux-pwm On Fri, May 21, 2021 at 04:39:25PM +0200, Uwe Kleine-König wrote: > > and it built for me. You're right. I appologize. I thought the linker would fail if we had the same variable in two files but I was wrong. regards, dan carpenter ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-05-21 16:26 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-05-20 12:25 [PATCH 0/6] Rid W=1 warnings from Comedi 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 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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox