usb: gadget Kconfig cleanup

[linux-2.6-omap-h63xx.git] / drivers / usb / core / hcd-pci.c

diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 84760ddbc3325cba6cfdc8b219c3d70f32e0a5ab..5b87ae7f0a6acc2d2ab7ecf3f7d4a3af2da1915c 100644 (file)
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -73,7 +73,6 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (pci_enable_device(dev) < 0)
                return -ENODEV;
        dev->current_state = PCI_D0;
-       dev->dev.power.power_state = PMSG_ON;
 
        if (!dev->irq) {
                dev_err(&dev->dev,
@@ -216,9 +215,9 @@ int usb_hcd_pci_suspend(struct pci_dev *dev, pm_message_t message)
                        hcd->state == HC_STATE_HALT))
                return -EBUSY;
 
-       if (hcd->driver->suspend) {
-               retval = hcd->driver->suspend(hcd, message);
-               suspend_report_result(hcd->driver->suspend, retval);
+       if (hcd->driver->pci_suspend) {
+               retval = hcd->driver->pci_suspend(hcd, message);
+               suspend_report_result(hcd->driver->pci_suspend, retval);
                if (retval)
                        goto done;
        }
@@ -302,8 +301,6 @@ int usb_hcd_pci_suspend(struct pci_dev *dev, pm_message_t message)
 
 done:
        if (retval == 0) {
-               dev->dev.power.power_state = PMSG_SUSPEND;
-
 #ifdef CONFIG_PPC_PMAC
                /* Disable ASIC clocks for USB */
                if (machine_is(powermac)) {
@@ -406,12 +403,10 @@ int usb_hcd_pci_resume(struct pci_dev *dev)
        pci_set_master(dev);
        pci_restore_state(dev);
 
-       dev->dev.power.power_state = PMSG_ON;
-
        clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
 
-       if (hcd->driver->resume) {
-               retval = hcd->driver->resume(hcd);
+       if (hcd->driver->pci_resume) {
+               retval = hcd->driver->pci_resume(hcd);
                if (retval) {
                        dev_err(hcd->self.controller,
                                "PCI post-resume error %d!\n", retval);