Subject: Re: [PATCH] e1000e: avoid duplicated output of device name in kernel warning

From: Frans Pop <[email-masked]>
Date: Wed, 3 Sep 2008 16:43:42 +0200

On Wednesday 03 September 2008, Jeff Garzik wrote:
> Jeff Kirsher wrote:
> > From: Frans Pop <[email-masked]>
> >
> > 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.
> >
> > Signed-off-by: Frans Pop <[email-masked]>
> > Signed-off-by: Andrew Morton <[email-masked]>
> > Signed-off-by: Jeff Kirsher <[email-masked]>
> > ---
> >
> >  drivers/net/e1000e/netdev.c |    6 ++++--
> >  1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/e1000e/netdev.c
> > b/drivers/net/e1000e/netdev.c index d266510..4563f34 100644
> > --- a/drivers/net/e1000e/netdev.c
> > +++ b/drivers/net/e1000e/netdev.c
> > @@ -4335,13 +4335,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");
>
> breaks build, should be "pdev->dev"

It was correct in the original patch I submitted and IIRC Andrew already 
noticed that error and added a "fixup" patch in his tree.

Cheers.
FJP