ieee1394: ohci1394: drop pcmcia-cs compatibility code

#ifdef PCMCIA is only true if compiled inside pcmcia-cs, isn't it?

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 380212573fb5..b7e816683fb0 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