Since whci_hcd_id_table is used only for module auto-loading
move it under #ifdef MODULE. This fixes following warning:
CC drivers/usb/host/whci/hcd.o
drivers/usb/host/whci/hcd.c:359: warning: ‘whci_hcd_id_table’ defined but not used
Signed-off-by: Namhyung Kim <[email protected]>
---
drivers/usb/host/whci/hcd.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/whci/hcd.c b/drivers/usb/host/whci/hcd.c
index 72b6892..ee76401 100644
--- a/drivers/usb/host/whci/hcd.c
+++ b/drivers/usb/host/whci/hcd.c
@@ -355,12 +355,14 @@ static void __exit whci_hc_driver_exit(void)
}
module_exit(whci_hc_driver_exit);
+#ifdef MODULE
/* PCI device ID's that we handle (so it gets loaded) */
static struct pci_device_id whci_hcd_id_table[] = {
{ PCI_DEVICE_CLASS(PCI_CLASS_WIRELESS_WHCI, ~0) },
{ /* empty last entry */ }
};
MODULE_DEVICE_TABLE(pci, whci_hcd_id_table);
+#endif
MODULE_DESCRIPTION("WHCI Wireless USB host controller driver");
MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");
--
1.7.0.4
Since whcrc_id_table is used only for module auto-loading
move it under #ifdef MODULE to fix following warning:
CC drivers/uwb/whc-rc.o
drivers/uwb/whc-rc.c:452: warning: ‘whcrc_id_table’ defined but not used
Signed-off-by: Namhyung Kim <[email protected]>
Cc: David Vrabel <[email protected]>
---
drivers/uwb/whc-rc.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/uwb/whc-rc.c b/drivers/uwb/whc-rc.c
index 7349558..e3bd62a 100644
--- a/drivers/uwb/whc-rc.c
+++ b/drivers/uwb/whc-rc.c
@@ -448,12 +448,14 @@ static int whcrc_post_reset(struct umc_dev *umc)
return uwb_rc_post_reset(uwb_rc);
}
+#ifdef MODULE
/* PCI device ID's that we handle [so it gets loaded] */
static struct pci_device_id whcrc_id_table[] = {
{ PCI_DEVICE_CLASS(PCI_CLASS_WIRELESS_WHCI, ~0) },
{ /* empty last entry */ }
};
MODULE_DEVICE_TABLE(pci, whcrc_id_table);
+#endif
static struct umc_driver whcrc_driver = {
.name = "whc-rc",
--
1.7.0.4
Since i1480_est_id_table is used only for module auto-loading
move it under #ifdef MODULE to fix following warning:
CC drivers/uwb/i1480/i1480-est.o
drivers/uwb/i1480/i1480-est.c:94: warning: ‘i1480_est_id_table’ defined but not used
Signed-off-by: Namhyung Kim <[email protected]>
Cc: David Vrabel <[email protected]>
---
drivers/uwb/i1480/i1480-est.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/uwb/i1480/i1480-est.c b/drivers/uwb/i1480/i1480-est.c
index f2eb4d8..bcbaea2 100644
--- a/drivers/uwb/i1480/i1480-est.c
+++ b/drivers/uwb/i1480/i1480-est.c
@@ -86,6 +86,7 @@ MODULE_AUTHOR("Inaky Perez-Gonzalez <[email protected]>");
MODULE_DESCRIPTION("i1480's Vendor Specific Event Size Tables");
MODULE_LICENSE("GPL");
+#ifdef MODULE
/**
* USB device ID's that we handle
*
@@ -97,3 +98,4 @@ static struct usb_device_id i1480_est_id_table[] = {
{ },
};
MODULE_DEVICE_TABLE(usb, i1480_est_id_table);
+#endif
--
1.7.0.4
On Thu, Dec 02, 2010 at 02:45:27AM +0900, Namhyung Kim wrote:
> Since whci_hcd_id_table is used only for module auto-loading
> move it under #ifdef MODULE. This fixes following warning:
>
> CC drivers/usb/host/whci/hcd.o
> drivers/usb/host/whci/hcd.c:359: warning: ‘whci_hcd_id_table’ defined but not used
>
> Signed-off-by: Namhyung Kim <[email protected]>
> ---
> drivers/usb/host/whci/hcd.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/usb/host/whci/hcd.c b/drivers/usb/host/whci/hcd.c
> index 72b6892..ee76401 100644
> --- a/drivers/usb/host/whci/hcd.c
> +++ b/drivers/usb/host/whci/hcd.c
> @@ -355,12 +355,14 @@ static void __exit whci_hc_driver_exit(void)
> }
> module_exit(whci_hc_driver_exit);
>
> +#ifdef MODULE
Ick, no, please just use the __used type instead. We don't want #ifdefs
in .c files if at all possible.
Same goes for the other 2 patches, care to redo them as well?
thanks,
greg k-h
On Thu, Dec 2, 2010 at 04:37, Greg KH <[email protected]> wrote:
> Ick, no, please just use the __used type instead. ?We don't want #ifdefs
> in .c files if at all possible.
>
> Same goes for the other 2 patches, care to redo them as well?
>
OK. Will send them again.
--
Regards,
Namhyung Kim