From 490b27cdc73d741436c75f2a133c63dac8c7ca06 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu, 13 Nov 2008 06:20:10 +0000
Subject: [PATCH] --- yaml --- r: 119092 b: refs/heads/master c:
 ac450208dea8cf1b9aa8feabd06a7209a282d749 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/igb/igb_main.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 29d8e4939cd0..70e1c4f57783 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f807044980dd51fdf9aa2df8d503d4757501b20
+refs/heads/master: ac450208dea8cf1b9aa8feabd06a7209a282d749
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index 0a9801516ae0..1cbae85b1426 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -1019,10 +1019,9 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 			state &= ~PCIE_LINK_STATE_L0S;
 			pci_write_config_word(us_dev, pos + PCI_EXP_LNKCTL,
 			                      state);
-			printk(KERN_INFO "Disabling ASPM L0s upstream switch "
-			       "port %x:%x.%x\n", us_dev->bus->number,
-			       PCI_SLOT(us_dev->devfn),
-			       PCI_FUNC(us_dev->devfn));
+			dev_info(&pdev->dev,
+				 "Disabling ASPM L0s upstream switch port %s\n",
+				 pci_name(us_dev));
 		}
 	default:
 		break;