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, 3 insertions, 7 deletions

diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index e6c534e62846..df0ddf14b85c 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -462,9 +462,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,
          * erratum 46: Setup violation on AGP SBA pins - Disable side band addressing.
          * With this lot disabled, we should prevent lockups. */
         if (agp_bridge->dev->device == PCI_DEVICE_ID_AMD_FE_GATE_700E) {
-                u8 revision=0;
-                pci_read_config_byte(pdev, PCI_REVISION_ID, &revision);
-                if (revision == 0x10 || revision == 0x11) {
+                if (pdev->revision == 0x10 || pdev->revision == 0x11) {
                         agp_bridge->flags = AGP_ERRATA_FASTWRITES;
                         agp_bridge->flags |= AGP_ERRATA_SBA;
                         agp_bridge->flags |= AGP_ERRATA_1X;
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 801abdd29066..d95662e96326 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -367,10 +367,8 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
 static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data *bridge)
 {
         char *revstring;
-        u8 rev_id;
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
-        switch (rev_id) {
+        switch (pdev->revision) {
         case 0x01: revstring="A0"; break;
         case 0x02: revstring="A1"; break;
         case 0x11: revstring="B0"; break;
@@ -386,7 +384,7 @@ static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data
          * Work around errata.
          * Chips before B2 stepping incorrectly reporting v3.5
          */
-        if (rev_id < 0x13) {
+        if (pdev->revision < 0x13) {
                 printk (KERN_INFO PFX "Correcting AGP revision (reports 3.5, is really 3.0)\n");
                 bridge->major_version = 3;
                 bridge->minor_version = 0;