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>
This commit is contained in:
parent
b2051f8873
commit
083922fe1c
|
@ -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!",
|
PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!",
|
||||||
(unsigned long long)pci_resource_len(dev, 0));
|
(unsigned long long)pci_resource_len(dev, 0));
|
||||||
|
|
||||||
/* Seems PCMCIA handles this internally. Not sure why. Seems
|
if (!request_mem_region(ohci_base, OHCI1394_REGISTER_SIZE,
|
||||||
* pretty bogus to force a driver to special case this. */
|
OHCI1394_DRIVER_NAME))
|
||||||
#ifndef PCMCIA
|
|
||||||
if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME))
|
|
||||||
FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable",
|
FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable",
|
||||||
(unsigned long long)ohci_base,
|
(unsigned long long)ohci_base,
|
||||||
(unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE);
|
(unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE);
|
||||||
#endif
|
|
||||||
ohci->init_state = OHCI_INIT_HAVE_MEM_REGION;
|
ohci->init_state = OHCI_INIT_HAVE_MEM_REGION;
|
||||||
|
|
||||||
ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE);
|
ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE);
|
||||||
|
@ -3509,10 +3506,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
|
||||||
iounmap(ohci->registers);
|
iounmap(ohci->registers);
|
||||||
|
|
||||||
case OHCI_INIT_HAVE_MEM_REGION:
|
case OHCI_INIT_HAVE_MEM_REGION:
|
||||||
#ifndef PCMCIA
|
|
||||||
release_mem_region(pci_resource_start(ohci->dev, 0),
|
release_mem_region(pci_resource_start(ohci->dev, 0),
|
||||||
OHCI1394_REGISTER_SIZE);
|
OHCI1394_REGISTER_SIZE);
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_PMAC
|
#ifdef CONFIG_PPC_PMAC
|
||||||
/* On UniNorth, power down the cable and turn off the chip clock
|
/* On UniNorth, power down the cable and turn off the chip clock
|
||||||
|
|
Loading…
Reference in a new issue