From d60e183289cd727f3a86c5d8e82f30de079e3819 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 22 Apr 2003 22:05:10 -0700 Subject: [PATCH] [PATCH] USB: hcd-pci.c catch up to dev_printk changes The preceding patch to fix this was incomplete, since it didn't work for the pure debug messages. And that was because the DEBUG-vs-CONFIG_USB_DEBUG stuff changed somewhere. --- drivers/usb/core/hcd-pci.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 52ebc9b3b9f62..90ca9816df797 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -17,11 +17,6 @@ */ #include -#include -#include -#include -#include -#include #ifdef CONFIG_USB_DEBUG #define DEBUG @@ -29,6 +24,11 @@ #undef DEBUG #endif +#include +#include +#include +#include +#include #include #include "hcd.h" @@ -214,7 +214,7 @@ void usb_hcd_pci_remove (struct pci_dev *dev) hub = hcd->self.root_hub; hcd->state = USB_STATE_QUIESCING; - dev_dbg (*hcd->controller, "roothub graceful disconnect\n"); + dev_dbg (hcd->controller, "roothub graceful disconnect\n"); usb_disconnect (&hub); hcd->driver->stop (hcd); @@ -326,7 +326,7 @@ int usb_hcd_pci_resume (struct pci_dev *dev) retval = -EBUSY; if (hcd->state != USB_STATE_SUSPENDED) { - dev_dbg (*hcd->controller, "can't resume, not suspended!\n"); + dev_dbg (hcd->controller, "can't resume, not suspended!\n"); goto done; } hcd->state = USB_STATE_RESUMING; @@ -336,7 +336,7 @@ int usb_hcd_pci_resume (struct pci_dev *dev) retval = hcd->driver->resume (hcd); if (!HCD_IS_RUNNING (hcd->state)) { - dev_dbg (*hcd->controller, "resume fail, retval %d\n", retval); + dev_dbg (hcd->controller, "resume fail, retval %d\n", retval); usb_hc_died (hcd); // FIXME: recover, reset etc. } else { -- 2.53.0