diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2009-01-12 08:09:46 -0800 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2009-01-12 08:09:46 -0800 |
| commit | eb75e036a8eeb91335c34e25192b410450f2bb6b (patch) | |
| tree | 499e75f6fb30b5733811605c11f879e96960b1b8 /linux/drivers/media/video/zoran/zoran_card.c | |
| parent | ab3f0e599b90a74d4dca9dd606c0530bba99868e (diff) | |
| download | mediapointer-dvb-s2-eb75e036a8eeb91335c34e25192b410450f2bb6b.tar.gz mediapointer-dvb-s2-eb75e036a8eeb91335c34e25192b410450f2bb6b.tar.bz2 | |
zoran: Remove zr36057_adr field
From: Trent Piepho <xyzzy@speakeasy.org>
The driver should only use the kernel mapped io address, zr36057_mem, and
not the PCI bus address, zr36057_adr. Since the latter is only printed out
once, there is no need to save it in the driver data structure.
There was some old code that looked like it was for the Alpha architecture
which would use the PCI bus address. It probably no longer applies to
modern kernels.
Priority: normal
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_card.c')
| -rw-r--r-- | linux/drivers/media/video/zoran/zoran_card.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_card.c b/linux/drivers/media/video/zoran/zoran_card.c index 6d5f7ed6d..5d0fa99f2 100644 --- a/linux/drivers/media/video/zoran/zoran_card.c +++ b/linux/drivers/media/video/zoran/zoran_card.c @@ -1298,14 +1298,13 @@ static int __devinit zoran_probe(struct pci_dev *pdev, mutex_init(&zr->resource_lock); if (pci_enable_device(pdev)) goto zr_free_mem; - zr->zr36057_adr = pci_resource_start(zr->pci_dev, 0); pci_read_config_byte(zr->pci_dev, PCI_CLASS_REVISION, &zr->revision); dprintk(1, KERN_INFO - "%s: Zoran ZR360%c7 (rev %d), irq: %d, memory: 0x%08x\n", + "%s: Zoran ZR360%c7 (rev %d), irq: %d, memory: 0x%08llx\n", ZR_DEVNAME(zr), zr->revision < 2 ? '5' : '6', zr->revision, - zr->pci_dev->irq, zr->zr36057_adr); + zr->pci_dev->irq, (uint64_t)pci_resource_start(zr->pci_dev, 0)); if (zr->revision >= 2) { dprintk(1, KERN_INFO @@ -1360,12 +1359,12 @@ static int __devinit zoran_probe(struct pci_dev *pdev, snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), "%s[%u]", zr->card.name, zr->id); - zr->zr36057_mem = ioremap_nocache(zr->zr36057_adr, 0x1000); + zr->zr36057_mem = pci_ioremap_bar(zr->pci_dev, 0); if (!zr->zr36057_mem) { dprintk(1, KERN_ERR - "%s: find_zr36057() - ioremap failed\n", - ZR_DEVNAME(zr)); + "%s: %s() - ioremap failed\n", + ZR_DEVNAME(zr), __func__); goto zr_free_mem; } |