Re: [Patch] Shut up warnings from files under drivers/

[Sam Ravnborg <sam@ravnborg.org>]

Hi WANG.
On Sat, Jan 26, 2008 at 05:30:07PM +0800, WANG Cong wrote:
> 
> Fix two kind of defined-but-not-used warnings.
> 
> One is due to defination of MODULE_DEVICE_TABLE, the
> other is due to __devexit_p. The solution is just to
> add proper directives to protect those usages.

Please include the actual warnings that you fix.

> 
> Compile tests passed.
> 
> Cc: Greg KH <gregkh@suse.de>
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
> 
> ---
> 
> diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
> index 1f0b752..247bc16 100644
> --- a/drivers/char/applicom.c
> +++ b/drivers/char/applicom.c
> @@ -65,6 +65,7 @@ static char *applicom_pci_devnames[] = {
>  	"PCI2000PFB"
>  };
>  
> +#ifdef MODULE
>  static struct pci_device_id applicom_pci_tbl[] = {
>  	{ PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC,
>  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> @@ -74,6 +75,8 @@ static struct pci_device_id applicom_pci_tbl[] = {
>  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
>  	{ 0 }
>  };
> +#endif
> +

As replacement for the above I would prefer som kind of annotation
so we can drop the symbol at linker time.
Something like:

>+  static struct pci_device_id applicom_pci_tbl[] __moduseddata = {
>       { PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC,
>         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> @@ -74,6 +75,8 @@ static struct pci_device_id applicom_pci_tbl[] = {
>         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
>       { 0 }
>  };

where we have:
#ifdef MODULE
#define __moduseddata  __section(.module.data)
#define __modusedconst __section(.module.rodata)
#define __modused      __section(.module.text)
#else
#define __moduseddata  __section(.discard.data)
#define __modusedconst __section(.discard.rodata)
#define __modused      __section(.discard.text)
#endif

And we can then discard the symbols as we do for
__initdata today.


Another much simpler solution could be to say:

>static struct pci_device_id applicom_pci_tbl[] __used = {
>       { PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC,
>         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> @@ -74,6 +75,8 @@ static struct pci_device_id applicom_pci_tbl[] = {
>         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
>       { 0 }
>  };

But we would then in the built-in case waste some memory.

> index 905d1f5..2009dc9 100644
> --- a/drivers/char/synclink.c
> +++ b/drivers/char/synclink.c
> @@ -897,7 +897,9 @@ static char *driver_version = "$Revision: 4.38 $";
>  
>  static int synclink_init_one (struct pci_dev *dev,
>  				     const struct pci_device_id *ent);
> +#if defined(MODULE) || defined(CONFIG_HOTPLUG)
>  static void synclink_remove_one (struct pci_dev *dev);
> +#endif
>  
>  static struct pci_device_id synclink_pci_tbl[] = {
>  	{ PCI_VENDOR_ID_MICROGATE, PCI_DEVICE_ID_MICROGATE_USC, PCI_ANY_ID, PCI_ANY_ID, },
> @@ -8166,7 +8168,8 @@ static int __devinit synclink_init_one (struct pci_dev *dev,
>  	return 0;
>  }
>  
> +#if defined(MODULE) || defined(CONFIG_HOTPLUG)
>  static void __devexit synclink_remove_one (struct pci_dev *dev)
>  {
>  }
> -
> +#endif

This function is properly annotated and __devexit_p() is used
so it should not generate a warning.

The root casue is that __devexit is defined to nothing in the
#ifdef CONFIG_HOTPLUG case - it should have been defined as
#define __devexit __used
if MODULE was not defined.

This is the better fix for these kind of warnings.
For the latter I have fixed this in kbuild.git.
So we are only left with the DEVICE_MOD_TABLE issue.

	Sam