Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50c31e4a authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Ingo Molnar
Browse files

x86, mtrr: Use pci_dev->revision 



This code uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so
it wasn't converted by commit 44c10138 ("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: default avatarSergei 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: default avatarIngo Molnar <mingo@elte.hu>
parent 192d8857

arch/x86/kernel/cpu/mtrr/main.c

+5 −8
Original line number Diff line number Diff line
@@ -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,14 +88,12 @@ 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) {

		    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

		 * write combining memory may resulting in data corruption