PCI: Change all drivers to use pci_device->revision

Instead of all drivers reading pci config space to get the revision
ID, they can now use the pci_device->revision member.

This exposes some issues where drivers where reading a word or a dword
for the revision number, and adding useless error-handling around the
read. Some drivers even just read it for no purpose of all.

In devices where the revision ID is being copied over and used in what
appears to be the equivalent of hotpath, I have left the copy code
and the cached copy as not to influence the driver's performance.

Compile tested with make all{yes,mod}config on x86_64 and i386.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Acked-by: Dave Jones <davej@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 2 insertions, 6 deletions

diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index fdf5d6e46eac..5e6f17df204b 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -94,7 +94,6 @@ struct gemtek_pci_card {
 
         u32 iobase;
         u32 length;
-        u8  chiprev;
         u16 model;
 
         u32 current_frequency;
@@ -415,7 +414,6 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci
                 goto err_pci;
         }
 
-        pci_read_config_byte( pci_dev, PCI_REVISION_ID, &card->chiprev );
         pci_read_config_word( pci_dev, PCI_SUBSYSTEM_ID, &card->model );
 
         pci_set_drvdata( pci_dev, card );
@@ -436,7 +434,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci
         gemtek_pci_mute( card );
 
         printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n",
-                card->chiprev, card->iobase, card->iobase + card->length - 1 );
+                pci_dev->revision, card->iobase, card->iobase + card->length - 1 );
 
         return 0;
 
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 664aba8b4d85..7533fc203319 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1809,7 +1809,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
 {
         int ret = -EBUSY;
         unsigned long mchip_adr;
-        u8 revision;
 
         if (meye.mchip_dev != NULL) {
                 printk(KERN_ERR "meye: only one device allowed!\n");
@@ -1885,7 +1884,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
                 goto outreqirq;
         }
 
-        pci_read_config_byte(meye.mchip_dev, PCI_REVISION_ID, &revision);
         pci_write_config_byte(meye.mchip_dev, PCI_CACHE_LINE_SIZE, 8);
         pci_write_config_byte(meye.mchip_dev, PCI_LATENCY_TIMER, 64);
 
@@ -1939,7 +1937,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
         printk(KERN_INFO "meye: Motion Eye Camera Driver v%s.\n",
                MEYE_DRIVER_VERSION);
         printk(KERN_INFO "meye: mchip KL5A72002 rev. %d, base %lx, irq %d\n",
-               revision, mchip_adr, meye.mchip_irq);
+               meye.mchip_dev->revision, mchip_adr, meye.mchip_irq);
 
         return 0;