Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

comedi: ni_*: do not declare unused variable range_ni_E_ao_ext

Browse Source 
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>
This commit is contained in:
Ian Abbott 2024-07-10 18:37:19 +01:00 committed by Greg Kroah-Hartman
parent 8400291e28
commit 4d41a49c46
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/comedi/drivers/ni_atmio.c
View File

@ -79,6 +79,15 @@
#include "ni_stc.h" #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 */ /* AT specific setup */
static const struct ni_board_struct ni_boards[] = { static const struct ni_board_struct ni_boards[] = {
{ {

9
drivers/comedi/drivers/ni_mio_common.c
View File

@ -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[] = { static const struct comedi_lrange *const ni_range_lkup[] = {
[ai_gain_16] = &range_ni_E_ai, [ai_gain_16] = &range_ni_E_ai,
[ai_gain_8] = &range_ni_E_ai_limited, [ai_gain_8] = &range_ni_E_ai_limited,

9
drivers/comedi/drivers/ni_pcimio.c
View File

@ -102,6 +102,15 @@
#define PCIDMA #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. * These are not all the possible ao ranges for 628x boards.
* They can do OFFSET +- REFERENCE where OFFSET can be * They can do OFFSET +- REFERENCE where OFFSET can be

2
drivers/comedi/drivers/ni_stc.h
View File

@ -1137,6 +1137,4 @@ struct ni_private {
u8 rgout0_usage; u8 rgout0_usage;
}; };
static const struct comedi_lrange range_ni_E_ao_ext;
#endif /* _COMEDI_NI_STC_H */ #endif /* _COMEDI_NI_STC_H */