From patchwork Sun Nov  7 12:46:26 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [04/16] Use get_vt8237_lpc() in vt8237_sb_enable_fid_vid().
Date: Sun, 07 Nov 2010 12:46:26 -0000
From: Tobias Diedrich <ranma+coreboot@tdiedrich.de>
X-Patchwork-Id: 2272
Message-Id: <20101107124725.620984807@yamamaya.is-a-geek.org>
To: coreboot@coreboot.org
Cc: Rudolf Marek <r.marek@assembler.cz>,
 Tobias Diedrich <ranma+coreboot@tdiedrich.de>

Use get_vt8237_lpc() in vt8237_sb_enable_fid_vid() too.
I broke this out into a seperate part to keep the other half as
straight-forward as possible.

Signed-off-by: Tobias Diedrich <ranma+coreboot@tdiedrich.de>
Acked-by: Rudolf Marek <r.marek@assembler.cz>

---


Index: src/southbridge/via/vt8237r/vt8237r_early_smbus.c
===================================================================
--- src/southbridge/via/vt8237r/vt8237r_early_smbus.c.orig	2010-11-06 22:40:21.000000000 +0100
+++ src/southbridge/via/vt8237r/vt8237r_early_smbus.c	2010-11-06 22:40:22.000000000 +0100
@@ -244,17 +244,15 @@
 void vt8237_sb_enable_fid_vid(void)
 {
 	device_t dev, devctl;
+	u16 devid;
 
 	/* Power management controller */
-	dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
-				       PCI_DEVICE_ID_VIA_VT8237R_LPC), 0);
-	if (dev == PCI_DEV_INVALID) {
-		/* Power management controller */
-		dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
-					PCI_DEVICE_ID_VIA_VT8237S_LPC), 0);
-		if (dev == PCI_DEV_INVALID)
-			return;
+	dev = get_vt8237_lpc();
+	if (dev == PCI_DEV_INVALID)
+		return;
 
+	devid = pci_read_config16(dev, PCI_DEVICE_ID);
+	if (devid == PCI_DEVICE_ID_VIA_VT8237S_LPC) {
 		devctl = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
 					   PCI_DEVICE_ID_VIA_VT8237_VLINK), 0);