From: Jeff Garzik <jeff@garzik.org>
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
Frans Pop <elendil@planet.nl>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] e1000e: avoid duplicated output of device name in kernel warning
Date: Wed, 03 Sep 2008 10:10:02 -0400 [thread overview]
Message-ID: <48BE9ABA.3030304@garzik.org> (raw)
In-Reply-To: <20080829000100.5149.26290.stgit@jtkirshe-mobile.jf.intel.com>
Jeff Kirsher wrote:
> From: Frans Pop <elendil@planet.nl>
>
> 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 <elendil@planet.nl>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>
> 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"
next prev parent reply other threads:[~2008-09-03 14:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-29 0:01 [PATCH] e1000e: avoid duplicated output of device name in kernel warning Jeff Kirsher
2008-09-03 14:10 ` Jeff Garzik [this message]
2008-09-03 14:43 ` Frans Pop
-- strict thread matches above, loose matches on Subject: below --
2008-08-18 10:19 e1000e: Silly repetition of PCI name in log message Frans Pop
2008-08-25 18:02 ` [PATCH] e1000e: Avoid duplicated output of device name in kernel warning Frans Pop
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48BE9ABA.3030304@garzik.org \
--to=jeff@garzik.org \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=elendil@planet.nl \
--cc=jeffrey.t.kirsher@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).