{"id":975,"url":"http://patchwork.ozlabs.org/api/1.0/patches/975/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222152.m8MLqN7D031975@imap1.linux-foundation.org>","date":"2008-09-22T21:52:22","name":"[13/21] e1000e: avoid duplicated output of device name in kernel warning","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"9d9c2e58fb0ce285cade1dbede47538599d2a33a","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":36,"url":"http://patchwork.ozlabs.org/api/1.0/users/36/?format=json","username":"jgarzik","first_name":"Jeff","last_name":"Garzik","email":"jgarzik@pobox.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222152.m8MLqN7D031975@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/975/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 77893DDF01\n\tfor ;\n\tTue, 23 Sep 2008 07:58:14 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754086AbYIVV6K (ORCPT );\n\tMon, 22 Sep 2008 17:58:10 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1753981AbYIVV6I\n\t(ORCPT ); Mon, 22 Sep 2008 17:58:08 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:52713 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753963AbYIVV6H (ORCPT\n\t); Mon, 22 Sep 2008 17:58:07 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLrDO7018507\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:57:33 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLqN7D031975; Mon, 22 Sep 2008 14:52:23 -0700"],"Message-Id":"<200809222152.m8MLqN7D031975@imap1.linux-foundation.org>","Subject":"[patch 13/21] e1000e: avoid duplicated output of device name in\n\tkernel warning","To":"jeff@garzik.org","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\telendil@planet.nl, jeffrey.t.kirsher@intel.com","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:52:22 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Frans Pop \n\nWith 2.6.27-rc3 I noticed the following messages in my boot log:\n\n0000:01:00.0: 0000:01:00.0: Warning: detected DSPD enabled in EEPROM\n0000:01:00.0: eth0: (PCI Express:2.5GB/s:Width x1) 00:16:76:04:ff:09\n\nThe second seems correct, but the first has a silly repetition of the\nPCI device before the actual message. The message originates from\ne1000_eeprom_checks in e1000e/netdev.c.\n\nWith this patch below the first message becomes\n\n e1000e 0000:01:00.0: Warning: detected DSPD enabled in EEPROM\n\nwhich makes it similar to directly preceding messages.\n\nUse dev_warn instead of e_warn in e1000_eeprom_checks() as the interface\nname has not yet been assigned at that point.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Frans Pop \nSigned-off-by: Jeff Kirsher \nCc: Jeff Garzik \nSigned-off-by: Andrew Morton \n---\n\n drivers/net/e1000e/netdev.c | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)","diff":"diff -puN drivers/net/e1000e/netdev.c~e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning drivers/net/e1000e/netdev.c\n--- a/drivers/net/e1000e/netdev.c~e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning\n+++ a/drivers/net/e1000e/netdev.c\n@@ -4671,13 +4671,15 @@ static void e1000_eeprom_checks(struct e\n \tret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf);\n \tif (!(le16_to_cpu(buf) & (1 << 0))) {\n \t\t/* Deep Smart Power Down (DSPD) */\n-\t\te_warn(\"Warning: detected DSPD enabled in EEPROM\\n\");\n+\t\tdev_warn(&adapter->pdev-dev,\n+\t\t\t \"Warning: detected DSPD enabled in EEPROM\\n\");\n \t}\n \n \tret_val = e1000_read_nvm(hw, NVM_INIT_3GIO_3, 1, &buf);\n \tif (le16_to_cpu(buf) & (3 << 2)) {\n \t\t/* ASPM enable */\n-\t\te_warn(\"Warning: detected ASPM enabled in EEPROM\\n\");\n+\t\tdev_warn(&adapter->pdev->dev,\n+\t\t\t \"Warning: detected ASPM enabled in EEPROM\\n\");\n \t}\n }\n \n","prefixes":["13/21"]}