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>

3 files changed, 1 insertions, 7 deletions

diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 999bf71937ca..ec1c556a47ca 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -3439,7 +3439,6 @@ static int __devinit
 cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int first_time = 1;
-        ucchar cpc_rev_id;
         int err, eeprom_outdated = 0;
         ucshort device_id;
         pc300_t *card;
@@ -3480,7 +3479,6 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         card->hw.falcsize = pci_resource_len(pdev, 4);
         card->hw.plxphys = pci_resource_start(pdev, 5);
         card->hw.plxsize = pci_resource_len(pdev, 5);
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &cpc_rev_id);
 
         switch (device_id) {
                 case PCI_DEVICE_ID_PC300_RX_1:
@@ -3498,7 +3496,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 #ifdef PC300_DEBUG_PCI
         printk("cpc (bus=0x0%x,pci_id=0x%x,", pdev->bus->number, pdev->devfn);
-        printk("rev_id=%d) IRQ%d\n", cpc_rev_id, card->hw.irq);
+        printk("rev_id=%d) IRQ%d\n", pdev->revision, card->hw.irq);
         printk("cpc:found  ramaddr=0x%08lx plxaddr=0x%08lx "
                "ctladdr=0x%08lx falcaddr=0x%08lx\n",
                card->hw.ramphys, card->hw.plxphys, card->hw.scaphys,
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index aff05dba720a..dfbd3b00f03b 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -311,7 +311,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
                                         const struct pci_device_id *ent)
 {
         card_t *card;
-        u8 rev_id;
         u32 __iomem *p;
         int i;
         u32 ramsize;
@@ -366,7 +365,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
                         return -ENOMEM;
                 }
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
         if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE ||
             pci_resource_len(pdev, 2) != PC300_SCA_SIZE ||
             pci_resource_len(pdev, 3) < 16384) {
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index ca06a00d9d86..7f720de2e9f0 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -289,7 +289,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                                          const struct pci_device_id *ent)
 {
         card_t *card;
-        u8 rev_id;
         u32 __iomem *p;
         int i;
         u32 ramsize;
@@ -330,7 +329,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                 return -ENOMEM;
         }
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
         if (pci_resource_len(pdev, 0) != PCI200SYN_PLX_SIZE ||
             pci_resource_len(pdev, 2) != PCI200SYN_SCA_SIZE ||
             pci_resource_len(pdev, 3) < 16384) {