comedi: ni_atmio: avoid warning for unused device_ids[] table

[PATCH] [RESEND] comedi: ni_atmio: avoid warning for unused device_ids[] table

Posted by Arnd Bergmann 11 months, 2 weeks ago

From: Arnd Bergmann <arnd@arndb.de>

When the driver is built-in, it produces a W=1 warning:

drivers/comedi/drivers/ni_atmio.c:209:35: error: 'device_ids' defined but not used [-Werror=unused-const-variable=]
  209 | static const struct pnp_device_id device_ids[] = {

The actual probe() function has a different way of identifying
the hardware, so just mark this one as __maybe_unused so it
can be dropped when built-in.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I sent this a year ago but there were no comments, resending now
without changes.
---
 drivers/comedi/drivers/ni_atmio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/comedi/drivers/ni_atmio.c b/drivers/comedi/drivers/ni_atmio.c
index 330ae1c58800..b4e759e5703f 100644
--- a/drivers/comedi/drivers/ni_atmio.c
+++ b/drivers/comedi/drivers/ni_atmio.c
@@ -215,7 +215,7 @@ static const int ni_irqpin[] = {
 
 #include "ni_mio_common.c"
 
-static const struct pnp_device_id device_ids[] = {
+static const struct pnp_device_id __maybe_unused device_ids[] = {
 	{.id = "NIC1900", .driver_data = 0},
 	{.id = "NIC2400", .driver_data = 0},
 	{.id = "NIC2500", .driver_data = 0},
-- 
2.39.5

Re: [PATCH] [RESEND] comedi: ni_atmio: avoid warning for unused device_ids[] table

Posted by Ian Abbott 11 months, 2 weeks ago

On 2025-02-25 14:53, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> When the driver is built-in, it produces a W=1 warning:
> 
> drivers/comedi/drivers/ni_atmio.c:209:35: error: 'device_ids' defined but not used [-Werror=unused-const-variable=]
>    209 | static const struct pnp_device_id device_ids[] = {
> 
> The actual probe() function has a different way of identifying
> the hardware, so just mark this one as __maybe_unused so it
> can be dropped when built-in.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> I sent this a year ago but there were no comments, resending now
> without changes.
> ---
>   drivers/comedi/drivers/ni_atmio.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/comedi/drivers/ni_atmio.c b/drivers/comedi/drivers/ni_atmio.c
> index 330ae1c58800..b4e759e5703f 100644
> --- a/drivers/comedi/drivers/ni_atmio.c
> +++ b/drivers/comedi/drivers/ni_atmio.c
> @@ -215,7 +215,7 @@ static const int ni_irqpin[] = {
>   
>   #include "ni_mio_common.c"
>   
> -static const struct pnp_device_id device_ids[] = {
> +static const struct pnp_device_id __maybe_unused device_ids[] = {
>   	{.id = "NIC1900", .driver_data = 0},
>   	{.id = "NIC2400", .driver_data = 0},
>   	{.id = "NIC2500", .driver_data = 0},

Looks good, thanks!

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

(Greg, would you be kind enough to commit this to one of your trees if 
OK with it? Thanks.)

-- 
-=( 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 )=-