From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Fri, 1 Jul 2011 18:34:42 +0000 (+0400)
Subject: ssb: use pci_dev->subsystem_{vendor,device}
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~17027^2~189^2^2~14
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=115f9450babbf2ed530db04e16a99df28cec85dd;p=mirror_ubuntu-artful-kernel.git

ssb: use pci_dev->subsystem_{vendor,device}

The SSB code reads PCI subsystem IDs from the PCI configuration registers while
they are already stored by the PCI subsystem in the 'subsystem_{vendor|device}'
fields of 'struct pci_dev'...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 3e36722b2ce2..a00b35f03084 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -734,10 +734,8 @@ out_free:
 static void ssb_pci_get_boardinfo(struct ssb_bus *bus,
 				  struct ssb_boardinfo *bi)
 {
-	pci_read_config_word(bus->host_pci, PCI_SUBSYSTEM_VENDOR_ID,
-			     &bi->vendor);
-	pci_read_config_word(bus->host_pci, PCI_SUBSYSTEM_ID,
-			     &bi->type);
+	bi->vendor = bus->host_pci->subsystem_vendor;
+	bi->type = bus->host_pci->subsystem_device;
 	bi->rev = bus->host_pci->revision;
 }