comedi: don't build module device_ids if built in

[PATCH] comedi: don't build module device_ids if built in

Posted by Ben Dooks 1 year, 11 months ago

If not building as a module, then the device_ids[] array is not used
by the  MODULE_DEVICE_TABLE(pnp, device_ids) so remove the warning
about it not being used by enclosing it in #ifdef MODULE

Fixes:

drivers/comedi/drivers/ni_atmio.c:209:35: warning: ‘device_ids’ defined but not used [-Wunused-const-variable=]

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 drivers/comedi/drivers/ni_atmio.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/comedi/drivers/ni_atmio.c b/drivers/comedi/drivers/ni_atmio.c
index 8876a1d24c56..f0dbe4c2341a 100644
--- a/drivers/comedi/drivers/ni_atmio.c
+++ b/drivers/comedi/drivers/ni_atmio.c
@@ -206,6 +206,7 @@ static const int ni_irqpin[] = {
 
 #include "ni_mio_common.c"
 
+#ifndef MODULE
 static const struct pnp_device_id device_ids[] = {
 	{.id = "NIC1900", .driver_data = 0},
 	{.id = "NIC2400", .driver_data = 0},
@@ -216,6 +217,7 @@ static const struct pnp_device_id device_ids[] = {
 };
 
 MODULE_DEVICE_TABLE(pnp, device_ids);
+#endif
 
 static int ni_isapnp_find_board(struct pnp_dev **dev)
 {
-- 
2.37.2.352.g3c44437643

Re: [PATCH] comedi: don't build module device_ids if built in

Posted by Ben Dooks 1 year, 11 months ago

On 08/03/2024 18:54, Ben Dooks wrote:
> If not building as a module, then the device_ids[] array is not used
> by the  MODULE_DEVICE_TABLE(pnp, device_ids) so remove the warning
> about it not being used by enclosing it in #ifdef MODULE
> 
> Fixes:
> 
> drivers/comedi/drivers/ni_atmio.c:209:35: warning: ‘device_ids’ defined but not used [-Wunused-const-variable=]
> 
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---
>   drivers/comedi/drivers/ni_atmio.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/comedi/drivers/ni_atmio.c b/drivers/comedi/drivers/ni_atmio.c
> index 8876a1d24c56..f0dbe4c2341a 100644
> --- a/drivers/comedi/drivers/ni_atmio.c
> +++ b/drivers/comedi/drivers/ni_atmio.c
> @@ -206,6 +206,7 @@ static const int ni_irqpin[] = {
>   
>   #include "ni_mio_common.c"
>   
> +#ifndef MODULE

Whoops, this was meant to be fixed to #ifdef.
Will send fixed patch Monday

>   static const struct pnp_device_id device_ids[] = {
>   	{.id = "NIC1900", .driver_data = 0},
>   	{.id = "NIC2400", .driver_data = 0},
> @@ -216,6 +217,7 @@ static const struct pnp_device_id device_ids[] = {
>   };
>   
>   MODULE_DEVICE_TABLE(pnp, device_ids);
> +#endif
>   
>   static int ni_isapnp_find_board(struct pnp_dev **dev)
>   {

-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

https://www.codethink.co.uk/privacy.html