[PATCH] ohci: avoid an unused variable warning

[PATCH] ohci: avoid an unused variable warning

[Jan Beulich]

With CONFIG_PM, but without CONFIG_PM_SLEEP, the intention of the
conditional in ohci_pci_start() doesn't work since device_may_wakeup()
references pdev only with the latter config option.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

 drivers/usb/host/ohci-pci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.24-rc5/drivers/usb/host/ohci-pci.c	2007-12-12 11:29:07.000000000 +0100
+++ 2.6.24-rc5-ohci-pm-sleep/drivers/usb/host/ohci-pci.c	2007-12-04 16:09:33.000000000 +0100
@@ -217,7 +217,7 @@ static int __devinit ohci_pci_start (str
 	struct ohci_hcd	*ohci = hcd_to_ohci (hcd);
 	int		ret;
 
-#ifdef CONFIG_PM /* avoid warnings about unused pdev */
+#ifdef CONFIG_PM_SLEEP /* avoid warnings about unused pdev */
 	if (hcd->self.controller) {
 		struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
 

Re: [PATCH] ohci: avoid an unused variable warning

[David Brownell]

On Thursday 13 December 2007, Jan Beulich wrote:
> 
> With CONFIG_PM, but without CONFIG_PM_SLEEP, the intention of the
> conditional in ohci_pci_start() doesn't work since device_may_wakeup()
> references pdev only with the latter config option.

Yuck.  That means that runtime power management won't work correctly.

The same wakeup mechanisms that apply during SUSPEND and HIBERNATION
are also used for runtime PM(*) ... which is allowed by CONFIG_PM, and
which accordingly should not depend on PM_SLEEP.

I think the bug is that device_may_wakeup() now looks at CONFIG_PM_SLEEP
instead of just CONFIG_PM.

- Dave

(*) Although ACPI has problems with the notion of runtime PM.  For
    example, it ignores PCI PME# signaling until PM_SLEEP transitions.