]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
usb: fix defined but not used warnings in hcd-pci.c
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 26 Feb 2012 00:09:40 +0000 (19:09 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Feb 2012 18:53:08 +0000 (10:53 -0800)
Shows up on ia64 builds (and possibly elsewhere) for configs that
don't set PM_RUNTIME or PM_SLEEP as follows:

drivers/usb/core/hcd-pci.c:383:12: warning: 'suspend_common' defined but not used
drivers/usb/core/hcd-pci.c:438:12: warning: 'resume_common' defined but not used

As per above, the functions are only used if RUNTIME/SLEEP are set,
so make the two functions conditional on these Kconfig values.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hcd-pci.c

index 81e2c0d9c17de1a54720ef0b0432208c706a966b..622b4a48e732e7a83b6c760d6563994394b0caa9 100644 (file)
@@ -380,6 +380,7 @@ static int check_root_hub_suspended(struct device *dev)
        return 0;
 }
 
+#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
 static int suspend_common(struct device *dev, bool do_wakeup)
 {
        struct pci_dev          *pci_dev = to_pci_dev(dev);
@@ -471,6 +472,7 @@ static int resume_common(struct device *dev, int event)
        }
        return retval;
 }
+#endif /* SLEEP || RUNTIME */
 
 #ifdef CONFIG_PM_SLEEP