aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-01-06 09:07:05 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-02-08 14:59:09 -0500
commit083922fe1c277603a03f0ca700fe5a76f11178c7 (patch)
tree13d1d1a6539cd92ca0f65b0a0ef246d66d7d1e4c /drivers/ieee1394
parentb2051f887351864d862160e75bc24362c7af8914 (diff)
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>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/ohci1394.c9
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,
3281 PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!", 3281 PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!",
3282 (unsigned long long)pci_resource_len(dev, 0)); 3282 (unsigned long long)pci_resource_len(dev, 0));
3283 3283
3284 /* Seems PCMCIA handles this internally. Not sure why. Seems 3284 if (!request_mem_region(ohci_base, OHCI1394_REGISTER_SIZE,
3285 * pretty bogus to force a driver to special case this. */ 3285 OHCI1394_DRIVER_NAME))
3286#ifndef PCMCIA
3287 if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME))
3288 FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable", 3286 FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable",
3289 (unsigned long long)ohci_base, 3287 (unsigned long long)ohci_base,
3290 (unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE); 3288 (unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE);
3291#endif
3292 ohci->init_state = OHCI_INIT_HAVE_MEM_REGION; 3289 ohci->init_state = OHCI_INIT_HAVE_MEM_REGION;
3293 3290
3294 ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE); 3291 ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE);
@@ -3509,10 +3506,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
3509 iounmap(ohci->registers); 3506 iounmap(ohci->registers);
3510 3507
3511 case OHCI_INIT_HAVE_MEM_REGION: 3508 case OHCI_INIT_HAVE_MEM_REGION:
3512#ifndef PCMCIA
3513 release_mem_region(pci_resource_start(ohci->dev, 0), 3509 release_mem_region(pci_resource_start(ohci->dev, 0),
3514 OHCI1394_REGISTER_SIZE); 3510 OHCI1394_REGISTER_SIZE);
3515#endif
3516 3511
3517#ifdef CONFIG_PPC_PMAC 3512#ifdef CONFIG_PPC_PMAC
3518 /* On UniNorth, power down the cable and turn off the chip clock 3513 /* On UniNorth, power down the cable and turn off the chip clock