From patchwork Mon Sep 22 21:52:23 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 976 X-Patchwork-Delegate: jgarzik@pobox.com 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]) by ozlabs.org (Postfix) with ESMTP id 298B1DDEF3 for ; Tue, 23 Sep 2008 07:58:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754111AbYIVV6M (ORCPT ); Mon, 22 Sep 2008 17:58:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754095AbYIVV6K (ORCPT ); Mon, 22 Sep 2008 17:58:10 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:35917 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754036AbYIVV6J (ORCPT ); Mon, 22 Sep 2008 17:58:09 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id m8MLrDNt018507 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 22 Sep 2008 14:57:04 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id m8MLqNtV031978; Mon, 22 Sep 2008 14:52:23 -0700 Message-Id: <200809222152.m8MLqNtV031978@imap1.linux-foundation.org> Subject: [patch 14/21] e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning-fix To: jeff@garzik.org Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, elendil@planet.nl, jeffrey.t.kirsher@intel.com From: akpm@linux-foundation.org Date: Mon, 22 Sep 2008 14:52:23 -0700 X-Spam-Status: No, hits=-3.359 required=5 tests=AWL, BAYES_00, OSDL_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 From: Andrew Morton hm. Cc: Frans Pop Cc: Jeff Garzik Cc: Jeff Kirsher Signed-off-by: Andrew Morton --- drivers/net/e1000e/netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/net/e1000e/netdev.c~e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning-fix drivers/net/e1000e/netdev.c --- a/drivers/net/e1000e/netdev.c~e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning-fix +++ a/drivers/net/e1000e/netdev.c @@ -4671,7 +4671,7 @@ 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) */ - dev_warn(&adapter->pdev-dev, + dev_warn(&adapter->pdev->dev, "Warning: detected DSPD enabled in EEPROM\n"); }