diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 057929e165ab..5462ce2f60ea 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -866,10 +866,10 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev, | |||
866 | pci_write_config_dword(pdev, 0x40, 0xffff); | 866 | pci_write_config_dword(pdev, 0x40, 0xffff); |
867 | 867 | ||
868 | IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, " | 868 | IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, " |
869 | "irq: %d, latency: %d, memory: 0x%lx\n", | 869 | "irq: %d, latency: %d, memory: 0x%llx\n", |
870 | pdev->device, pdev->revision, pdev->bus->number, | 870 | pdev->device, pdev->revision, pdev->bus->number, |
871 | PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), | 871 | PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), |
872 | pdev->irq, pci_latency, (unsigned long)itv->base_addr); | 872 | pdev->irq, pci_latency, (u64)itv->base_addr); |
873 | 873 | ||
874 | return 0; | 874 | return 0; |
875 | } | 875 | } |
@@ -1007,7 +1007,7 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, | |||
1007 | itv->cxhdl.priv = itv; | 1007 | itv->cxhdl.priv = itv; |
1008 | itv->cxhdl.func = ivtv_api_func; | 1008 | itv->cxhdl.func = ivtv_api_func; |
1009 | 1009 | ||
1010 | IVTV_DEBUG_INFO("base addr: 0x%08x\n", itv->base_addr); | 1010 | IVTV_DEBUG_INFO("base addr: 0x%llx\n", (u64)itv->base_addr); |
1011 | 1011 | ||
1012 | /* PCI Device Setup */ | 1012 | /* PCI Device Setup */ |
1013 | retval = ivtv_setup_pci(itv, pdev, pci_id); | 1013 | retval = ivtv_setup_pci(itv, pdev, pci_id); |
@@ -1017,8 +1017,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, | |||
1017 | goto free_mem; | 1017 | goto free_mem; |
1018 | 1018 | ||
1019 | /* map io memory */ | 1019 | /* map io memory */ |
1020 | IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n", | 1020 | IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n", |
1021 | itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE); | 1021 | (u64)itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE); |
1022 | itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET, | 1022 | itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET, |
1023 | IVTV_ENCODER_SIZE); | 1023 | IVTV_ENCODER_SIZE); |
1024 | if (!itv->enc_mem) { | 1024 | if (!itv->enc_mem) { |
@@ -1034,8 +1034,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, | |||
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | if (itv->has_cx23415) { | 1036 | if (itv->has_cx23415) { |
1037 | IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n", | 1037 | IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n", |
1038 | itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE); | 1038 | (u64)itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE); |
1039 | itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET, | 1039 | itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET, |
1040 | IVTV_DECODER_SIZE); | 1040 | IVTV_DECODER_SIZE); |
1041 | if (!itv->dec_mem) { | 1041 | if (!itv->dec_mem) { |
@@ -1056,8 +1056,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, | |||
1056 | } | 1056 | } |
1057 | 1057 | ||
1058 | /* map registers memory */ | 1058 | /* map registers memory */ |
1059 | IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n", | 1059 | IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n", |
1060 | itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE); | 1060 | (u64)itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE); |
1061 | itv->reg_mem = | 1061 | itv->reg_mem = |
1062 | ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE); | 1062 | ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE); |
1063 | if (!itv->reg_mem) { | 1063 | if (!itv->reg_mem) { |