e1000e: avoid duplicated output of device name in kernel warning
Subsystems (2)
PATCH 13/21 e1000e: avoid duplicated output of device name in kernel warning
From: Frans Pop <[email protected]>
With 2.6.27-rc3 I noticed the following messages in my boot log:
0000:01:00.0: 0000:01:00.0: Warning: detected DSPD enabled in EEPROM 0000:01:00.0: eth0: (PCI Express:2.5GB/s:Width x1) 00:16:76:04:ff:09
The second seems correct, but the first has a silly repetition of the PCI device before the actual message. The message originates from e1000_eeprom_checks in e1000e/netdev.c.
With this patch below the first message becomes
e1000e 0000:01:00.0: Warning: detected DSPD enabled in EEPROM
which makes it similar to directly preceding messages.
Use dev_warn instead of e_warn in e1000_eeprom_checks() as the interface name has not yet been assigned at that point.
---
drivers/net/e1000e/netdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/e1000e/netdev.c renamed from drivers/net/e1000e/netdev.c~e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning +4 -2
@@ -4671,13 +4671,15 @@ static void e1000_eeprom_checks(struct e 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" ); } }
_