* [PATCH 0/6] Rid W=1 warnings from Comedi
@ 2021-05-20 12:25 Lee Jones
2021-05-20 12:25 ` [PATCH 1/6] comedi: comedi_8254: Fix descriptions for 'i8254' and 'iobase' Lee Jones
` (5 more replies)
0 siblings, 6 replies; 17+ 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] 17+ messages in thread
* [PATCH 1/6] comedi: comedi_8254: Fix descriptions for 'i8254' and 'iobase'
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:25 ` [PATCH 2/6] comedi: drivers: jr3_pci: Remove set but unused variable 'min_full_scale' Lee Jones
` (4 subsequent siblings)
5 siblings, 0 replies; 17+ 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,
David A. Schleef, linux-staging
Fixes the following W=1 kernel build warning(s):
drivers/staging/comedi/drivers/comedi_8254.c:561: warning: Function parameter or member 'i8254' not described in 'comedi_8254_subdevice_init'
drivers/staging/comedi/drivers/comedi_8254.c:620: warning: Function parameter or member 'iobase' not described in 'comedi_8254_init'
drivers/staging/comedi/drivers/comedi_8254.c:620: warning: Excess function parameter 'mmio' description in 'comedi_8254_init'
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "David A. Schleef" <ds@schleef.org>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/comedi/drivers/comedi_8254.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/comedi/drivers/comedi_8254.c b/drivers/comedi/drivers/comedi_8254.c
index d1d509e9add94..4bf5daa9e8855 100644
--- a/drivers/comedi/drivers/comedi_8254.c
+++ b/drivers/comedi/drivers/comedi_8254.c
@@ -555,6 +555,7 @@ static int comedi_8254_insn_config(struct comedi_device *dev,
/**
* comedi_8254_subdevice_init - initialize a comedi_subdevice for the 8254 timer
* @s: comedi_subdevice struct
+ * @i8254: comedi_8254 struct
*/
void comedi_8254_subdevice_init(struct comedi_subdevice *s,
struct comedi_8254 *i8254)
@@ -607,7 +608,7 @@ static struct comedi_8254 *__i8254_init(unsigned long iobase,
/**
* comedi_8254_init - allocate and initialize the 8254 device for pio access
- * @mmio: port I/O base address
+ * @iobase: port I/O base address
* @osc_base: base time of the counter in ns
* OPTIONAL - only used by comedi_8254_cascade_ns_to_timer()
* @iosize: I/O register size
--
2.31.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/6] comedi: drivers: jr3_pci: Remove set but unused variable 'min_full_scale'
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 ` Lee Jones
2021-05-20 13:22 ` Ian Abbott
2021-05-20 12:25 ` [PATCH 3/6] comedi: drivers: ni_tio: Fix slightly broken kernel-doc and demote others Lee Jones
` (3 subsequent siblings)
5 siblings, 1 reply; 17+ 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,
Alexander A. Klimov, Anders Blomdell, linux-staging
Fixes the following W=1 kernel build warning(s):
drivers/staging/comedi/drivers/jr3_pci.c: In function ‘jr3_pci_poll_subdevice’:
drivers/staging/comedi/drivers/jr3_pci.c:507:22: warning: variable ‘min_full_scale’ set but not used [-Wunused-but-set-variable]
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de>
Cc: Anders Blomdell <anders.blomdell@control.lth.se>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/comedi/drivers/jr3_pci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/comedi/drivers/jr3_pci.c b/drivers/comedi/drivers/jr3_pci.c
index 7a02c4fa3cda8..afa2f8d5c8c0c 100644
--- a/drivers/comedi/drivers/jr3_pci.c
+++ b/drivers/comedi/drivers/jr3_pci.c
@@ -504,10 +504,9 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s)
result = poll_delay_min_max(20, 100);
} else {
/* Set full scale */
- struct six_axis_t min_full_scale;
struct six_axis_t max_full_scale;
- min_full_scale = get_min_full_scales(sensor);
+ get_min_full_scales(sensor);
max_full_scale = get_max_full_scales(sensor);
set_full_scales(sensor, max_full_scale);
--
2.31.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/6] comedi: drivers: ni_tio: Fix slightly broken kernel-doc and demote others
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 12:25 ` Lee Jones
2021-05-20 12:25 ` [PATCH 4/6] comedi: drivers: ni_routes: Demote non-conforming kernel-doc headers Lee Jones
` (2 subsequent siblings)
5 siblings, 0 replies; 17+ 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,
Mori Hess, J.P. Mellor, Herman.Bruyninckx, Wim.Meeussen,
Klaas.Gadeyne, Comedi, linux-staging
Fixes the following W=1 kernel build warning(s):
drivers/staging/comedi/drivers/ni_tio.c:1515: warning: Function parameter or member 'counter_dev' not described in 'ni_tio_get_routing'
drivers/staging/comedi/drivers/ni_tio.c:1515: warning: Function parameter or member 'dest' not described in 'ni_tio_get_routing'
drivers/staging/comedi/drivers/ni_tio.c:1515: warning: expecting prototype for Retrieves the register value of the current source of the output selector for(). Prototype was for ni_tio_get_routing() instead
drivers/staging/comedi/drivers/ni_tio.c:1544: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
drivers/staging/comedi/drivers/ni_tio.c:1584: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Cc: "J.P. Mellor" <jpmellor@rose-hulman.edu>
Cc: Herman.Bruyninckx@mech.kuleuven.ac.be
Cc: Wim.Meeussen@mech.kuleuven.ac.be
Cc: Klaas.Gadeyne@mech.kuleuven.ac.be
Cc: Comedi <comedi@comedi.org>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/comedi/drivers/ni_tio.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/comedi/drivers/ni_tio.c b/drivers/comedi/drivers/ni_tio.c
index f6154addaa956..da6826d77e600 100644
--- a/drivers/comedi/drivers/ni_tio.c
+++ b/drivers/comedi/drivers/ni_tio.c
@@ -1501,7 +1501,7 @@ int ni_tio_insn_config(struct comedi_device *dev,
}
EXPORT_SYMBOL_GPL(ni_tio_insn_config);
-/**
+/*
* Retrieves the register value of the current source of the output selector for
* the given destination.
*
@@ -1541,10 +1541,10 @@ int ni_tio_get_routing(struct ni_gpct_device *counter_dev, unsigned int dest)
EXPORT_SYMBOL_GPL(ni_tio_get_routing);
/**
- * Sets the register value of the selector MUX for the given destination.
- * @counter_dev:Pointer to general counter device.
- * @destination:Device-global identifier of route destination.
- * @register_value:
+ * ni_tio_set_routing() - Sets the register value of the selector MUX for the given destination.
+ * @counter_dev: Pointer to general counter device.
+ * @dest: Device-global identifier of route destination.
+ * @reg:
* The first several bits of this value should store the desired
* value to write to the register. All other bits are for
* transmitting information that modify the mode of the particular
@@ -1580,7 +1580,7 @@ int ni_tio_set_routing(struct ni_gpct_device *counter_dev, unsigned int dest,
}
EXPORT_SYMBOL_GPL(ni_tio_set_routing);
-/**
+/*
* Sets the given destination MUX to its default value or disable it.
*
* Return: 0 if successful; -EINVAL if terminal is unknown.
--
2.31.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/6] comedi: drivers: ni_routes: Demote non-conforming kernel-doc headers
2021-05-20 12:25 [PATCH 0/6] Rid W=1 warnings from Comedi Lee Jones
` (2 preceding siblings ...)
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 ` 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:25 ` [PATCH 6/6] comedi: drivers: comedi_isadma: Fix misspelling of 'dma_chan1' Lee Jones
5 siblings, 0 replies; 17+ 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,
Alexander A. Klimov, Spencer E. Olson, linux-staging
Fixes the following W=1 kernel build warning(s):
drivers/staging/comedi/drivers/ni_routes.c:249: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
drivers/staging/comedi/drivers/ni_routes.c:398: warning: Function parameter or member 'routes' not described in 'ni_route_set_has_source'
drivers/staging/comedi/drivers/ni_routes.c:398: warning: Function parameter or member 'source' not described in 'ni_route_set_has_source'
drivers/staging/comedi/drivers/ni_routes.c:524: warning: Function parameter or member 'src_sel_reg_value' not described in 'ni_find_route_source'
drivers/staging/comedi/drivers/ni_routes.c:524: warning: Function parameter or member 'dest' not described in 'ni_find_route_source'
drivers/staging/comedi/drivers/ni_routes.c:524: warning: Function parameter or member 'tables' not described in 'ni_find_route_source'
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de>
Cc: "Spencer E. Olson" <olsonse@umich.edu>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/comedi/drivers/ni_routes.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/comedi/drivers/ni_routes.c b/drivers/comedi/drivers/ni_routes.c
index 1f2aa3b239a0d..f0f8cd424b309 100644
--- a/drivers/comedi/drivers/ni_routes.c
+++ b/drivers/comedi/drivers/ni_routes.c
@@ -245,7 +245,7 @@ unsigned int ni_get_valid_routes(const struct ni_route_tables *tables,
}
EXPORT_SYMBOL_GPL(ni_get_valid_routes);
-/**
+/*
* List of NI global signal names that, as destinations, are only routeable
* indirectly through the *_arg elements of the comedi_cmd structure.
*/
@@ -387,7 +387,7 @@ ni_find_route_set(const int destination,
}
EXPORT_SYMBOL_GPL(ni_find_route_set);
-/**
+/*
* ni_route_set_has_source() - Determines whether the given source is in
* included given route_set.
*
@@ -506,7 +506,7 @@ s8 ni_route_to_register(const int src, const int dest,
}
EXPORT_SYMBOL_GPL(ni_route_to_register);
-/**
+/*
* ni_find_route_source() - Finds the signal source corresponding to a signal
* route (src-->dest) of the specified routing register
* value and the specified route destination on the
--
2.31.1
^ permalink raw reply related [flat|nested] 17+ 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
` (3 preceding siblings ...)
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 ` Lee Jones
2021-05-20 12:47 ` Uwe Kleine-König
2021-05-20 13:45 ` Ian Abbott
2021-05-20 12:25 ` [PATCH 6/6] comedi: drivers: comedi_isadma: Fix misspelling of 'dma_chan1' Lee Jones
5 siblings, 2 replies; 17+ 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] 17+ messages in thread
* [PATCH 6/6] comedi: drivers: comedi_isadma: Fix misspelling of 'dma_chan1'
2021-05-20 12:25 [PATCH 0/6] Rid W=1 warnings from Comedi Lee Jones
` (4 preceding siblings ...)
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:25 ` Lee Jones
5 siblings, 0 replies; 17+ 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,
linux-staging
Fixes the following W=1 kernel build warning(s):
drivers/staging/comedi/drivers/comedi_isadma.c:157: warning: Function parameter or member 'dma_chan1' not described in 'comedi_isadma_alloc'
drivers/staging/comedi/drivers/comedi_isadma.c:157: warning: Excess function parameter 'dma_chan' description in 'comedi_isadma_alloc'
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/comedi/drivers/comedi_isadma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/comedi/drivers/comedi_isadma.c b/drivers/comedi/drivers/comedi_isadma.c
index c729094298c2f..479b58e209ba6 100644
--- a/drivers/comedi/drivers/comedi_isadma.c
+++ b/drivers/comedi/drivers/comedi_isadma.c
@@ -143,7 +143,7 @@ EXPORT_SYMBOL_GPL(comedi_isadma_set_mode);
* comedi_isadma_alloc - allocate and initialize the ISA DMA
* @dev: comedi_device struct
* @n_desc: the number of cookies to allocate
- * @dma_chan: DMA channel for the first cookie
+ * @dma_chan1: DMA channel for the first cookie
* @dma_chan2: DMA channel for the second cookie
* @maxsize: the size of the buffer to allocate for each cookie
* @dma_dir: the DMA direction
--
2.31.1
^ permalink raw reply related [flat|nested] 17+ 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; 17+ 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] 17+ messages in thread
* Re: [PATCH 2/6] comedi: drivers: jr3_pci: Remove set but unused variable 'min_full_scale'
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
0 siblings, 1 reply; 17+ messages in thread
From: Ian Abbott @ 2021-05-20 13:22 UTC (permalink / raw
To: Lee Jones
Cc: linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman,
Alexander A. Klimov, Anders Blomdell, linux-staging
On 20/05/2021 13:25, Lee Jones wrote:
> Fixes the following W=1 kernel build warning(s):
>
> drivers/staging/comedi/drivers/jr3_pci.c: In function ‘jr3_pci_poll_subdevice’:
> drivers/staging/comedi/drivers/jr3_pci.c:507:22: warning: variable ‘min_full_scale’ set but not used [-Wunused-but-set-variable]
>
> Cc: Ian Abbott <abbotti@mev.co.uk>
> Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de>
> Cc: Anders Blomdell <anders.blomdell@control.lth.se>
> Cc: linux-staging@lists.linux.dev
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/comedi/drivers/jr3_pci.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Actually, that one is stale now (or will be when Greg's staging-next
branch gets merged into linux-next soon):
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/?h=staging-next&id=b9f38e913a926b455e5048a95f53a993b515509f
| staging: comedi: Remove unused variable ‘min_full_scale’ and function
'get_min_full_scales'
|
| The variable ‘min_full_scale’ and function 'get_min_full_scales' are
| not used, So delete them.
--
-=( 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] 17+ 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; 17+ 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] 17+ 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; 17+ 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] 17+ messages in thread
* Re: [PATCH 2/6] comedi: drivers: jr3_pci: Remove set but unused variable 'min_full_scale'
2021-05-20 13:22 ` Ian Abbott
@ 2021-05-21 7:28 ` Lee Jones
0 siblings, 0 replies; 17+ messages in thread
From: Lee Jones @ 2021-05-21 7:28 UTC (permalink / raw
To: Ian Abbott
Cc: linux-kernel, H Hartley Sweeten, Greg Kroah-Hartman,
Alexander A. Klimov, Anders Blomdell, linux-staging
On Thu, 20 May 2021, Ian Abbott wrote:
> On 20/05/2021 13:25, Lee Jones wrote:
> > Fixes the following W=1 kernel build warning(s):
> >
> > drivers/staging/comedi/drivers/jr3_pci.c: In function ‘jr3_pci_poll_subdevice’:
> > drivers/staging/comedi/drivers/jr3_pci.c:507:22: warning: variable ‘min_full_scale’ set but not used [-Wunused-but-set-variable]
> >
> > Cc: Ian Abbott <abbotti@mev.co.uk>
> > Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de>
> > Cc: Anders Blomdell <anders.blomdell@control.lth.se>
> > Cc: linux-staging@lists.linux.dev
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> > drivers/comedi/drivers/jr3_pci.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
>
> Actually, that one is stale now (or will be when Greg's staging-next branch
> gets merged into linux-next soon):
>
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/?h=staging-next&id=b9f38e913a926b455e5048a95f53a993b515509f
>
> | staging: comedi: Remove unused variable ‘min_full_scale’ and function
> 'get_min_full_scales'
> |
> | The variable ‘min_full_scale’ and function 'get_min_full_scales' are
> | not used, So delete them.
>
No worries, if it's fixed, it's fixed.
Could you please take the patches that you are happy with.
I'll rework or drop the remainder, thanks.
--
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] 17+ 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; 17+ 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] 17+ 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; 17+ 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] 17+ 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; 17+ 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] 17+ 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; 17+ 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] 17+ 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; 17+ 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] 17+ messages in thread
end of thread, other threads:[~2021-05-21 16:26 UTC | newest]
Thread overview: 17+ 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 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
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
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).