summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/southbridge/amd/agesa/hudson/hudson.c10
-rw-r--r--src/southbridge/amd/pi/hudson/hudson.c7
2 files changed, 4 insertions, 13 deletions
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index eb8ae52193..9fb81a6364 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -83,10 +83,7 @@ void hudson_enable(struct device *dev)
switch (dev->path.pci.devfn) {
case PCI_DEVFN(0x14, 5):
if (dev->enabled == 0) {
- // read the VENDEV ID
- struct device *usb_dev =
- dev_find_slot( 0, PCI_DEVFN( 0x14, 5));
- u32 usb_device_id = pci_read_config32(usb_dev, 0) >> 16;
+ u32 usb_device_id = pci_read_config32(dev, 0) >> 16;
u8 reg8;
if (usb_device_id == PCI_DEVICE_ID_AMD_SB900_USB_20_5) {
/* turn off and remove device 0:14.5 from PCI space */
@@ -99,10 +96,7 @@ void hudson_enable(struct device *dev)
case PCI_DEVFN(0x14, 7):
if (dev->enabled == 0) {
- // read the VENDEV ID
- struct device *sd_dev =
- dev_find_slot( 0, PCI_DEVFN( 0x14, 7));
- u32 sd_device_id = pci_read_config32( sd_dev, 0) >> 16;
+ u32 sd_device_id = pci_read_config32(dev, 0) >> 16;
/* turn off the SDHC controller in the PM reg */
u8 reg8;
if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) {
diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index a1c805dea1..bd9deb135b 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -59,12 +59,9 @@ void hudson_enable(struct device *dev)
{
printk(BIOS_DEBUG, "hudson_enable()\n");
switch (dev->path.pci.devfn) {
- case (0x14 << 3) | 7: /* 0:14.7 SD */
+ case PCI_DEVFN(0x14, 7): /* SD */
if (dev->enabled == 0) {
- // read the VENDEV ID
- struct device *sd_dev =
- dev_find_slot( 0, PCI_DEVFN( 0x14, 7));
- u32 sd_device_id = pci_read_config32( sd_dev, 0) >> 16;
+ u32 sd_device_id = pci_read_config32(dev, 0) >> 16;
/* turn off the SDHC controller in the PM reg */
u8 reg8;
if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) {