mtrr: use pci_dev->revision
PATCH 1/1 mtrr: use pci_dev->revision
This code uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it wasn't converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (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 <[email protected]>
---
The patch is against the recent Linus' tree.
arch/x86/kernel/cpu/mtrr/main.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/mtrr/main.c +5 -8
@@ -79,7 +79,6 @@ void set_mtrr_ops(const struct mtrr_opsstatic 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
[tip:x86/mtrr] x86, mtrr: Use pci_dev->revision
Commit-ID: 50c31e4a2497ea17747b587e8f96b278f07f5483 Gitweb: http://git.kernel.org/tip/50c31e4a2497ea17747b587e8f96b278f07f5483 Author: Sergei Shtylyov <[email protected]> AuthorDate: Fri, 1 Jul 2011 22:42:08 +0400 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 2 Jul 2011 11:10:07 +0200
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 <[email protected]>
Cc Suresh Siddha <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/mtrr/main.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/mtrr/main.c +5 -8
@@ -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