comedi: ni_*: do not declare unused variable range_ni_E_ao_ext

Mirsad Todorovac reported a compiler warning in "ni_stc.h" due to the
variable `range_ni_E_ao_ext` being defined but unused when building the
"ni_routes_test" module.

The `range_ni_E_ao_ext` variable is tentatively defined in "ni_stc.h"
(with internal linkage) and fully defined in "ni_mio_common.c".
"ni_stc.h" and/or "ni_mio_common.c" are included by the "ni_atmio",
"ni_pcimio", "ni_mio_cs", and "ni_routes_test" modules, which will each
get their own local `range_ni_E_ao_ext` variable defined.  However, it
is not used by the "ni_mio_cs" or "ni_routes_test" modules.  They should
get optimized out, but there are compiler warnings about the unused
variable when built with the `W=1` option.

Move the full definition of the variable from "ni_mio_common.c" into the
places where it is used, namely "ni_atmio.c" and "ni_pcimio.c", and
remove the tentative definition of the variable from "ni_stc.h".  This
fixes the compiler warnings.

Reported-by: Mirsad Todorovac <mtodorovac69@gmail.com>
Link: https://lore.kernel.org/lkml/3bab8580-c01a-4183-94af-ba3193c94c0e@gmail.com/
Cc: Mirsad Todorovac <mtodorovac69@gmail.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20240710173719.3559437-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/comedi/drivers/ni_atmio.c b/drivers/comedi/drivers/ni_atmio.c
index 8876a1d24c56c2825fdaefc9b1f92eb3b45722e0..330ae1c5880079eaf4f3f6b8914f56b03b0675c5 100644 (file)
--- a/drivers/comedi/drivers/ni_atmio.c
+++ b/drivers/comedi/drivers/ni_atmio.c
@@ -79,6 +79,15 @@
 
 #include "ni_stc.h"
 
+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)
+       }
+};
+
 /* AT specific setup */
 static const struct ni_board_struct ni_boards[] = {
        {

diff --git a/drivers/comedi/drivers/ni_mio_common.c b/drivers/comedi/drivers/ni_mio_common.c
index 980f309d6de7898fb2bf6e52aee32b05e9f47a49..3acb449d293cb33476c417ca8618e7029c0b6549 100644 (file)
--- a/drivers/comedi/drivers/ni_mio_common.c
+++ b/drivers/comedi/drivers/ni_mio_common.c
@@ -166,15 +166,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_pcimio.c b/drivers/comedi/drivers/ni_pcimio.c
index 0b055321023d7b8c74f1a6de00db96445fca71e7..f63c390314e1f69da34da44bd3c4cc950108280a 100644 (file)
--- a/drivers/comedi/drivers/ni_pcimio.c
+++ b/drivers/comedi/drivers/ni_pcimio.c
@@ -102,6 +102,15 @@
 
 #define PCIDMA
 
+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)
+       }
+};
+
 /*
  * These are not all the possible ao ranges for 628x boards.
  * They can do OFFSET +- REFERENCE where OFFSET can be

diff --git a/drivers/comedi/drivers/ni_stc.h b/drivers/comedi/drivers/ni_stc.h
index fbc0b753a0f592b6a91a74f791b40eb11019f1d2..7837e4683c6d2433f81b6cd8682d19b3ac52f60d 100644 (file)
--- a/drivers/comedi/drivers/ni_stc.h
+++ b/drivers/comedi/drivers/ni_stc.h
@@ -1137,6 +1137,4 @@ struct ni_private {
        u8 rgout0_usage;
 };
 
-static const struct comedi_lrange range_ni_E_ao_ext;
-
 #endif /* _COMEDI_NI_STC_H */