x86, mtrr: Use pci_dev->revision

This code uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so
it wasn't converted by commit 44c10138fd4 ("PCI: Change all
drivers to use pci_device->revision") before being moved to
arch/x86/...

Do it now at last -- and save one level of indentation...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Link: http://lkml.kernel.org/r/201107012242.08347.sshtylyov@ru.mvista.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 8 deletions

diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 707b6377adf1..08119a37e53c 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -79,7 +79,6 @@ void set_mtrr_ops(const struct mtrr_ops *ops)
 static int have_wrcomb(void)
 {
         struct pci_dev *dev;
-        u8 rev;
 
         dev = pci_get_class(PCI_CLASS_BRIDGE_HOST << 8, NULL);
         if (dev != NULL) {
@@ -89,13 +88,11 @@ static int have_wrcomb(void)
                  * chipsets to be tagged
                  */
                 if (dev->vendor == PCI_VENDOR_ID_SERVERWORKS &&
-                    dev->device == PCI_DEVICE_ID_SERVERWORKS_LE) {
-                        pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);
-                        if (rev <= 5) {
-                                pr_info("mtrr: Serverworks LE rev < 6 detected. Write-combining disabled.\n");
-                                pci_dev_put(dev);
-                                return 0;
-                        }
+                    dev->device == PCI_DEVICE_ID_SERVERWORKS_LE &&
+                    dev->revision <= 5) {
+                        pr_info("mtrr: Serverworks LE rev < 6 detected. Write-combining disabled.\n");
+                        pci_dev_put(dev);
+                        return 0;
                 }
                 /*
                  * Intel 450NX errata # 23. Non ascending cacheline evictions to