From 9b8cf966ba4f0d19d55cd9e8bde9129c79bb175e Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Mon, 22 Sep 2008 14:52:22 -0700 Subject: [PATCH] --- yaml --- r: 111920 b: refs/heads/master c: 6c2a9efadec464f848b18216e41783d3c01c7d10 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d5e0dfbd7f15..01000d87b753 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4e77d063d61e4703db813470fefe90dac672b55 +refs/heads/master: 6c2a9efadec464f848b18216e41783d3c01c7d10 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 0925204cd2d8..24d05cb70055 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -4671,13 +4671,15 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter) ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf); if (!(le16_to_cpu(buf) & (1 << 0))) { /* Deep Smart Power Down (DSPD) */ - e_warn("Warning: detected DSPD enabled in EEPROM\n"); + dev_warn(&adapter->pdev->dev, + "Warning: detected DSPD enabled in EEPROM\n"); } ret_val = e1000_read_nvm(hw, NVM_INIT_3GIO_3, 1, &buf); if (le16_to_cpu(buf) & (3 << 2)) { /* ASPM enable */ - e_warn("Warning: detected ASPM enabled in EEPROM\n"); + dev_warn(&adapter->pdev->dev, + "Warning: detected ASPM enabled in EEPROM\n"); } }