diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 10 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-alsa.c | 8 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-mpeg.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 8 |
6 files changed, 20 insertions, 18 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 423e954948be..aa3203ae670c 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -4019,8 +4019,9 @@ static int __devinit bttv_probe(struct pci_dev *dev, | |||
4019 | if (!request_mem_region(pci_resource_start(dev,0), | 4019 | if (!request_mem_region(pci_resource_start(dev,0), |
4020 | pci_resource_len(dev,0), | 4020 | pci_resource_len(dev,0), |
4021 | btv->c.name)) { | 4021 | btv->c.name)) { |
4022 | printk(KERN_WARNING "bttv%d: can't request iomem (0x%lx).\n", | 4022 | printk(KERN_WARNING "bttv%d: can't request iomem (0x%llx).\n", |
4023 | btv->c.nr, pci_resource_start(dev,0)); | 4023 | btv->c.nr, |
4024 | (unsigned long long)pci_resource_start(dev,0)); | ||
4024 | return -EBUSY; | 4025 | return -EBUSY; |
4025 | } | 4026 | } |
4026 | pci_set_master(dev); | 4027 | pci_set_master(dev); |
@@ -4031,8 +4032,9 @@ static int __devinit bttv_probe(struct pci_dev *dev, | |||
4031 | pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); | 4032 | pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); |
4032 | printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ", | 4033 | printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ", |
4033 | bttv_num,btv->id, btv->revision, pci_name(dev)); | 4034 | bttv_num,btv->id, btv->revision, pci_name(dev)); |
4034 | printk("irq: %d, latency: %d, mmio: 0x%lx\n", | 4035 | printk("irq: %d, latency: %d, mmio: 0x%llx\n", |
4035 | btv->c.pci->irq, lat, pci_resource_start(dev,0)); | 4036 | btv->c.pci->irq, lat, |
4037 | (unsigned long long)pci_resource_start(dev,0)); | ||
4036 | schedule(); | 4038 | schedule(); |
4037 | 4039 | ||
4038 | btv->bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000); | 4040 | btv->bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000); |
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index 2194cbeca33b..292a5e81eb75 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
@@ -712,9 +712,9 @@ static int __devinit snd_cx88_create(struct snd_card *card, | |||
712 | pci_read_config_byte(pci, PCI_LATENCY_TIMER, &chip->pci_lat); | 712 | pci_read_config_byte(pci, PCI_LATENCY_TIMER, &chip->pci_lat); |
713 | 713 | ||
714 | dprintk(1,"ALSA %s/%i: found at %s, rev: %d, irq: %d, " | 714 | dprintk(1,"ALSA %s/%i: found at %s, rev: %d, irq: %d, " |
715 | "latency: %d, mmio: 0x%lx\n", core->name, devno, | 715 | "latency: %d, mmio: 0x%llx\n", core->name, devno, |
716 | pci_name(pci), chip->pci_rev, pci->irq, | 716 | pci_name(pci), chip->pci_rev, pci->irq, |
717 | chip->pci_lat,pci_resource_start(pci,0)); | 717 | chip->pci_lat,(unsigned long long)pci_resource_start(pci,0)); |
718 | 718 | ||
719 | chip->irq = pci->irq; | 719 | chip->irq = pci->irq; |
720 | synchronize_irq(chip->irq); | 720 | synchronize_irq(chip->irq); |
@@ -766,8 +766,8 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci, | |||
766 | 766 | ||
767 | strcpy (card->driver, "CX88x"); | 767 | strcpy (card->driver, "CX88x"); |
768 | sprintf(card->shortname, "Conexant CX%x", pci->device); | 768 | sprintf(card->shortname, "Conexant CX%x", pci->device); |
769 | sprintf(card->longname, "%s at %#lx", | 769 | sprintf(card->longname, "%s at %#llx", |
770 | card->shortname, pci_resource_start(pci, 0)); | 770 | card->shortname,(unsigned long long)pci_resource_start(pci, 0)); |
771 | strcpy (card->mixername, "CX88"); | 771 | strcpy (card->mixername, "CX88"); |
772 | 772 | ||
773 | dprintk (0, "%s/%i: ALSA support for cx2388x boards\n", | 773 | dprintk (0, "%s/%i: ALSA support for cx2388x boards\n", |
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index 26f4c0fb8c36..973d3f39b2d5 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -1031,8 +1031,8 @@ static int get_ressources(struct cx88_core *core, struct pci_dev *pci) | |||
1031 | pci_resource_len(pci,0), | 1031 | pci_resource_len(pci,0), |
1032 | core->name)) | 1032 | core->name)) |
1033 | return 0; | 1033 | return 0; |
1034 | printk(KERN_ERR "%s: can't get MMIO memory @ 0x%lx\n", | 1034 | printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n", |
1035 | core->name,pci_resource_start(pci,0)); | 1035 | core->name,(unsigned long long)pci_resource_start(pci,0)); |
1036 | return -EBUSY; | 1036 | return -EBUSY; |
1037 | } | 1037 | } |
1038 | 1038 | ||
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index a9d7795a8e14..2c12aca1b6a3 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -420,9 +420,9 @@ int cx8802_init_common(struct cx8802_dev *dev) | |||
420 | pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev); | 420 | pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev); |
421 | pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER, &dev->pci_lat); | 421 | pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER, &dev->pci_lat); |
422 | printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, " | 422 | printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, " |
423 | "latency: %d, mmio: 0x%lx\n", dev->core->name, | 423 | "latency: %d, mmio: 0x%llx\n", dev->core->name, |
424 | pci_name(dev->pci), dev->pci_rev, dev->pci->irq, | 424 | pci_name(dev->pci), dev->pci_rev, dev->pci->irq, |
425 | dev->pci_lat,pci_resource_start(dev->pci,0)); | 425 | dev->pci_lat,(unsigned long long)pci_resource_start(dev->pci,0)); |
426 | 426 | ||
427 | /* initialize driver struct */ | 427 | /* initialize driver struct */ |
428 | spin_lock_init(&dev->slock); | 428 | spin_lock_init(&dev->slock); |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index dcda5291b990..8d5cf474b68e 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1847,9 +1847,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, | |||
1847 | pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev); | 1847 | pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev); |
1848 | pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat); | 1848 | pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat); |
1849 | printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, " | 1849 | printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, " |
1850 | "latency: %d, mmio: 0x%lx\n", core->name, | 1850 | "latency: %d, mmio: 0x%llx\n", core->name, |
1851 | pci_name(pci_dev), dev->pci_rev, pci_dev->irq, | 1851 | pci_name(pci_dev), dev->pci_rev, pci_dev->irq, |
1852 | dev->pci_lat,pci_resource_start(pci_dev,0)); | 1852 | dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0)); |
1853 | 1853 | ||
1854 | pci_set_master(pci_dev); | 1854 | pci_set_master(pci_dev); |
1855 | if (!pci_dma_supported(pci_dev,0xffffffff)) { | 1855 | if (!pci_dma_supported(pci_dev,0xffffffff)) { |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index f0c2111f14ad..da3007d2f411 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -871,9 +871,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
871 | pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev); | 871 | pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev); |
872 | pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat); | 872 | pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat); |
873 | printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, " | 873 | printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, " |
874 | "latency: %d, mmio: 0x%lx\n", dev->name, | 874 | "latency: %d, mmio: 0x%llx\n", dev->name, |
875 | pci_name(pci_dev), dev->pci_rev, pci_dev->irq, | 875 | pci_name(pci_dev), dev->pci_rev, pci_dev->irq, |
876 | dev->pci_lat,pci_resource_start(pci_dev,0)); | 876 | dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0)); |
877 | pci_set_master(pci_dev); | 877 | pci_set_master(pci_dev); |
878 | if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) { | 878 | if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) { |
879 | printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name); | 879 | printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name); |
@@ -905,8 +905,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
905 | pci_resource_len(pci_dev,0), | 905 | pci_resource_len(pci_dev,0), |
906 | dev->name)) { | 906 | dev->name)) { |
907 | err = -EBUSY; | 907 | err = -EBUSY; |
908 | printk(KERN_ERR "%s: can't get MMIO memory @ 0x%lx\n", | 908 | printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n", |
909 | dev->name,pci_resource_start(pci_dev,0)); | 909 | dev->name,(unsigned long long)pci_resource_start(pci_dev,0)); |
910 | goto fail1; | 910 | goto fail1; |
911 | } | 911 | } |
912 | dev->lmmio = ioremap(pci_resource_start(pci_dev,0), 0x1000); | 912 | dev->lmmio = ioremap(pci_resource_start(pci_dev,0), 0x1000); |