[media] use pci_dev->revision

pci_setup_device() has saved the PCI revision in the pci_dev
struct since Linux 2.6.23.  Use it.

Cc: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 9f47e383c57a5778bc39161c06d2c6631d317b46..9af2140b57a4c94c6b2571e7fb718747338ab62e 100644 (file)
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -378,12 +378,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        dev->pci = pci;
 
        /* get chip-revision; this is needed to enable bug-fixes */
-       err = pci_read_config_dword(pci, PCI_CLASS_REVISION, &dev->revision);
-       if (err < 0) {
-               ERR(("pci_read_config_dword() failed.\n"));
-               goto err_disable;
-       }
-       dev->revision &= 0xf;
+       dev->revision = pci->revision;
 
        /* remap the memory from virtual to physical address */
 

diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
index 03f96d6ca8946ecafc837295cee0bc41ec51b666..44f8fb5f17ff49c9a6fadc912d9d69b278ea5be7 100644 (file)
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -290,10 +290,8 @@ static void flexcop_pci_dma_exit(struct flexcop_pci *fc_pci)
 static int flexcop_pci_init(struct flexcop_pci *fc_pci)
 {
        int ret;
-       u8 card_rev;
 
-       pci_read_config_byte(fc_pci->pdev, PCI_CLASS_REVISION, &card_rev);
-       info("card revision %x", card_rev);
+       info("card revision %x", fc_pci->pdev->revision);
 
        if ((ret = pci_enable_device(fc_pci->pdev)) != 0)
                return ret;

diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index 99d62094f90865cf7e502d33bcffaa9f5567d278..b34fa95185e4ac65ac96200c8a800d46889504d8 100644 (file)
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -460,7 +460,7 @@ static int __devinit bt878_probe(struct pci_dev *dev,
                goto fail0;
        }
 
-       pci_read_config_byte(dev, PCI_CLASS_REVISION, &bt->revision);
+       bt->revision = dev->revision;
        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
 
 

diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c
index 10a432a79d00b8cc464eb4058fce7f125738a62b..371558af2d9613fd45307c2e8a95d0ccaf62f4e9 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_pci.c
+++ b/drivers/media/dvb/mantis/mantis_pci.c
@@ -48,7 +48,7 @@
 
 int __devinit mantis_pci_init(struct mantis_pci *mantis)
 {
-       u8 revision, latency;
+       u8 latency;
        struct mantis_hwconfig *config  = mantis->hwconfig;
        struct pci_dev *pdev            = mantis->pdev;
        int err, ret = 0;
@@ -95,9 +95,8 @@ int __devinit mantis_pci_init(struct mantis_pci *mantis)
        }
 
        pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency);
-       pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
        mantis->latency = latency;
-       mantis->revision = revision;
+       mantis->revision = pdev->revision;
 
        dprintk(MANTIS_ERROR, 0, "    Mantis Rev %d [%04x:%04x], ",
                mantis->revision,

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 91399c94cd18901bd657958ec3f4197f2649f043..a97cf2750bd99a3c41d071707dd16a3c285b1183 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -4303,7 +4303,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
                goto fail0;
        }
 
-       pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision);
+       btv->revision = dev->revision;
        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
        printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ",
               bttv_num,btv->id, btv->revision, pci_name(dev));

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 321c1b79794c05c623833467b74a967059740285..841ea4ef6200798e462c387cbeb37c64ce4edf69 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -818,7 +818,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev,
        cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
        pci_write_config_word(pci_dev, PCI_COMMAND, cmd);
 
-       pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &cx->card_rev);
+       cx->card_rev = pci_dev->revision;
        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &pci_latency);
 
        if (pci_latency < 64 && cx18_pci_latency) {

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 9933810b4e33a34499261f65e9fc6df883862640..64d9b2136ff6b536fa1c22e11eb1c9bc80a9185f 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -2045,7 +2045,7 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
        }
 
        /* print pci info */
-       pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
+       dev->pci_rev = pci_dev->revision;
        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
        printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
               "latency: %d, mmio: 0x%llx\n", dev->name,

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index addf9545e9bf42d6dac1591377e843763cee9305..9b500e691a5ceafb13dd5afc0736c6de806e6391 100644 (file)
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -474,7 +474,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
                return -EIO;
        }
 
-       pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev);
+       dev->pci_rev = dev->pci->revision;
        pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER,  &dev->pci_lat);
        printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, "
               "latency: %d, mmio: 0x%llx\n", dev->core->name,

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 287a41ee1c4f6d6cd2a0a1ced34cd2950c5aaf7f..b1f734dccea0edb2291f2e6303756461fd654906 100644 (file)
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1832,7 +1832,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
        dev->core = core;
 
        /* print pci info */
-       pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
+       dev->pci_rev = pci_dev->revision;
        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
        printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
               "latency: %d, mmio: 0x%llx\n", core->name,

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 39946420b3014b2d55135abbb12d7aeff5dfead7..a4e4dfdbc2f2c9474c5616b9b68f44abb762dd75 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -810,7 +810,6 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
                          const struct pci_device_id *pci_id)
 {
        u16 cmd;
-       u8 card_rev;
        unsigned char pci_latency;
 
        IVTV_DEBUG_INFO("Enabling pci device\n");
@@ -857,7 +856,6 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
        }
        IVTV_DEBUG_INFO("Bus Mastering Enabled.\n");
 
-       pci_read_config_byte(pdev, PCI_CLASS_REVISION, &card_rev);
        pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &pci_latency);
 
        if (pci_latency < 64 && ivtv_pci_latency) {
@@ -874,7 +872,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
 
        IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, "
                   "irq: %d, latency: %d, memory: 0x%lx\n",
-                  pdev->device, card_rev, pdev->bus->number,
+                  pdev->device, pdev->revision, pdev->bus->number,
                   PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
                   pdev->irq, pci_latency, (unsigned long)itv->base_addr);
 

diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 41f836fc93ec3adf4e2cdfc909220904244771b4..f9be737ba6f4fceafa2d71faf133f3d0c8f47774 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -927,7 +927,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        }
 
        /* print pci info */
-       pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
+       dev->pci_rev = pci_dev->revision;
        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
        printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, "
               "latency: %d, mmio: 0x%llx\n", dev->name,

diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
index b813aec1e456cd46a807c5e86790cf8d2e2e0a0f..3b7d7b4e303448187f6b74ee51b802d82c89ac0c 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-core.c
+++ b/drivers/media/video/saa7164/saa7164-core.c
@@ -1247,7 +1247,7 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
        }
 
        /* print pci info */
-       pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
+       dev->pci_rev = pci_dev->revision;
        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
        printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
               "latency: %d, mmio: 0x%llx\n", dev->name,

diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 9f2bac51964781f51c2e5b9789511d9b3d04668c..ba6878b2d6632b1be00d0c7087a56a35e565870b 100644 (file)
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1230,7 +1230,7 @@ static int __devinit zoran_probe(struct pci_dev *pdev,
        mutex_init(&zr->other_lock);
        if (pci_enable_device(pdev))
                goto zr_unreg;
-       pci_read_config_byte(zr->pci_dev, PCI_CLASS_REVISION, &zr->revision);
+       zr->revision = zr->pci_dev->revision;
 
        dprintk(1,
                KERN_INFO