1 files changed, 4 insertions, 13 deletions

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 628130a58af3..5729e412cc4a 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3281,14 +3281,11 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
                 PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!",
                       (unsigned long long)pci_resource_len(dev, 0));
 
-        /* Seems PCMCIA handles this internally. Not sure why. Seems
-         * pretty bogus to force a driver to special case this.  */
-#ifndef PCMCIA
-        if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME))
+        if (!request_mem_region(ohci_base, OHCI1394_REGISTER_SIZE,
+                                OHCI1394_DRIVER_NAME))
                 FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable",
                         (unsigned long long)ohci_base,
                         (unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE);
-#endif
         ohci->init_state = OHCI_INIT_HAVE_MEM_REGION;
 
         ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE);
@@ -3509,10 +3506,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
                 iounmap(ohci->registers);
 
         case OHCI_INIT_HAVE_MEM_REGION:
-#ifndef PCMCIA
                 release_mem_region(pci_resource_start(ohci->dev, 0),
                                    OHCI1394_REGISTER_SIZE);
-#endif
 
 #ifdef CONFIG_PPC_PMAC
         /* On UniNorth, power down the cable and turn off the chip clock
@@ -3541,9 +3536,6 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         int err;
         struct ti_ohci *ohci = pci_get_drvdata(pdev);
 
-        printk(KERN_INFO "%s does not fully support suspend and resume yet\n",
-               OHCI1394_DRIVER_NAME);
-
         if (!ohci) {
                 printk(KERN_ERR "%s: tried to suspend nonexisting host\n",
                        OHCI1394_DRIVER_NAME);
@@ -3630,15 +3622,14 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
         mdelay(50);
         ohci_initialize(ohci);
 
+        hpsb_resume_host(ohci->host);
         return 0;
 }
 #endif /* CONFIG_PM */
 
-#define PCI_CLASS_FIREWIRE_OHCI     ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10)
-
 static struct pci_device_id ohci1394_pci_tbl[] = {
         {
-                .class =        PCI_CLASS_FIREWIRE_OHCI,
+                .class =        PCI_CLASS_SERIAL_FIREWIRE_OHCI,
                 .class_mask =   PCI_ANY_ID,
                 .vendor =       PCI_ANY_ID,
                 .device =       PCI_ANY_ID,