diff options
Diffstat (limited to 'drivers/ieee1394/ohci1394.c')
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 3d278412e1ca..f0d5f2b7de87 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -590,11 +590,11 @@ static void ohci_initialize(struct ti_ohci *ohci) | |||
590 | buf = reg_read(ohci, OHCI1394_Version); | 590 | buf = reg_read(ohci, OHCI1394_Version); |
591 | sprintf (irq_buf, "%d", ohci->dev->irq); | 591 | sprintf (irq_buf, "%d", ohci->dev->irq); |
592 | PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s] " | 592 | PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s] " |
593 | "MMIO=[%lx-%lx] Max Packet=[%d] IR/IT contexts=[%d/%d]", | 593 | "MMIO=[%llx-%llx] Max Packet=[%d] IR/IT contexts=[%d/%d]", |
594 | ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10), | 594 | ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10), |
595 | ((((buf) >> 4) & 0xf) + ((buf) & 0xf) * 10), irq_buf, | 595 | ((((buf) >> 4) & 0xf) + ((buf) & 0xf) * 10), irq_buf, |
596 | pci_resource_start(ohci->dev, 0), | 596 | (unsigned long long)pci_resource_start(ohci->dev, 0), |
597 | pci_resource_start(ohci->dev, 0) + OHCI1394_REGISTER_SIZE - 1, | 597 | (unsigned long long)pci_resource_start(ohci->dev, 0) + OHCI1394_REGISTER_SIZE - 1, |
598 | ohci->max_packet_size, | 598 | ohci->max_packet_size, |
599 | ohci->nb_iso_rcv_ctx, ohci->nb_iso_xmit_ctx); | 599 | ohci->nb_iso_rcv_ctx, ohci->nb_iso_xmit_ctx); |
600 | 600 | ||
@@ -3270,15 +3270,16 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, | |||
3270 | * clearly says it's 2kb, so this shouldn't be a problem. */ | 3270 | * clearly says it's 2kb, so this shouldn't be a problem. */ |
3271 | ohci_base = pci_resource_start(dev, 0); | 3271 | ohci_base = pci_resource_start(dev, 0); |
3272 | if (pci_resource_len(dev, 0) < OHCI1394_REGISTER_SIZE) | 3272 | if (pci_resource_len(dev, 0) < OHCI1394_REGISTER_SIZE) |
3273 | PRINT(KERN_WARNING, "PCI resource length of %lx too small!", | 3273 | PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!", |
3274 | pci_resource_len(dev, 0)); | 3274 | (unsigned long long)pci_resource_len(dev, 0)); |
3275 | 3275 | ||
3276 | /* Seems PCMCIA handles this internally. Not sure why. Seems | 3276 | /* Seems PCMCIA handles this internally. Not sure why. Seems |
3277 | * pretty bogus to force a driver to special case this. */ | 3277 | * pretty bogus to force a driver to special case this. */ |
3278 | #ifndef PCMCIA | 3278 | #ifndef PCMCIA |
3279 | if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME)) | 3279 | if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME)) |
3280 | FAIL(-ENOMEM, "MMIO resource (0x%lx - 0x%lx) unavailable", | 3280 | FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable", |
3281 | ohci_base, ohci_base + OHCI1394_REGISTER_SIZE); | 3281 | (unsigned long long)ohci_base, |
3282 | (unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE); | ||
3282 | #endif | 3283 | #endif |
3283 | ohci->init_state = OHCI_INIT_HAVE_MEM_REGION; | 3284 | ohci->init_state = OHCI_INIT_HAVE_MEM_REGION; |
3284 | 3285 | ||