From patchwork Tue Jan 15 17:28:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 212270 X-Patchwork-Delegate: davem@davemloft.net 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 60B702C009B for ; Wed, 16 Jan 2013 04:30:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756882Ab3AORaP (ORCPT ); Tue, 15 Jan 2013 12:30:15 -0500 Received: from mail-pb0-f41.google.com ([209.85.160.41]:32983 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756823Ab3AORaI (ORCPT ); Tue, 15 Jan 2013 12:30:08 -0500 Received: by mail-pb0-f41.google.com with SMTP id xa7so170639pbc.28 for ; Tue, 15 Jan 2013 09:30:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=xQS2+oYBqP7wETa1bhB3zUX9/MizVY8m8Vcagt4qUNo=; b=cqIS2Y+vIZ0ySgsRxsKNiUHihwSXqZbQIIM1imlBWGeBpFlicajXZgfcWSPTWcpB3n 26UUqWCQHSecyF4ydHNB9UUzPM+PFTT9QHCDrukYXLe97Tla4BG62yRXbEHcIQRYESp/ VXq4NvAvVH+y06X4gljraSksrbiUGEaO/XYVAnavbpxrDVZFWmrlU1veMGKcn/NtWbPS dzr6TonepfKsDEAXbnz0v02Rp/Rz0xm6GpF2eytYLJDEadV5DaMQGy77LCda12Xwh9zK YzpJFxnYlCd/zP9sKVdt+a+u5Wbkv9z5mPOOBoi7tU0nTaO+whghxaAI0izcDKb4VGiX y5uQ== X-Received: by 10.66.87.67 with SMTP id v3mr108510074paz.63.1358271008111; Tue, 15 Jan 2013 09:30:08 -0800 (PST) Received: from nehalam.home.lan (static-50-53-80-93.bvtn.or.frontiernet.net. [50.53.80.93]) by mx.google.com with ESMTPS id m3sm11200522pav.4.2013.01.15.09.30.06 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Jan 2013 09:30:07 -0800 (PST) From: Stephen Hemminger To: David Miller , Shreyas Bhatewara Cc: pv-drivers@vmware.com, netdev@vger.kernel.org, Stephen Hemminger Subject: [PATCH 03/10] vmxnet3: fix messages printed before registration Date: Tue, 15 Jan 2013 09:28:28 -0800 Message-Id: <1358270915-32758-4-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358270915-32758-1-git-send-email-stephen@networkplumber.org> References: <1358270915-32758-1-git-send-email-stephen@networkplumber.org> X-Gm-Message-State: ALoCoQkfgGf8LtNMubklkR4FAWI4Ms65saQvuF2llKZcDEykj7Cv7wn2a8864ouGDdLaBbI8/7Xe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This messages that occur during boot time from this device when netdev_err is called before calling register_netdevice(). Switch to using dev_XXX macros which correlate message with PCI info which is available. Rather than fixing the features message, just remove it since the information is redundant and available through ethtool. Signed-off-by: Stephen Hemminger --- drivers/net/vmxnet3/vmxnet3_drv.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 99ef9ed..7b10d9c 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2671,10 +2671,6 @@ vmxnet3_declare_features(struct vmxnet3_adapter *adapter, bool dma64) netdev->vlan_features = netdev->hw_features & ~(NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_FILTER; - - netdev_info(adapter->netdev, - "features: sg csum vlan jf tso tsoIPv6 lro%s\n", - dma64 ? " highDMA" : ""); } @@ -2717,7 +2713,7 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, adapter->intr.num_intrs = vectors; return 0; } else if (err < 0) { - netdev_err(adapter->netdev, + dev_err(&adapter->netdev->dev, "Failed to enable MSI-X, error: %d\n", err); vectors = 0; } else if (err < vector_threshold) { @@ -2726,15 +2722,16 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, /* If fails to enable required number of MSI-x vectors * try enabling minimum number of vectors required. */ - netdev_err(adapter->netdev, - "Failed to enable %d MSI-X, trying %d instead\n", + dev_err(&adapter->netdev->dev, + "Failed to enable %d MSI-X, trying %d instead\n", vectors, vector_threshold); vectors = vector_threshold; } } - netdev_info(adapter->netdev, - "Number of MSI-X interrupts which can be allocated are lower than min threshold required.\n"); + dev_info(&adapter->pdev->dev, + "Number of MSI-X interrupts which can be allocated " + "is lower than min threshold required.\n"); return err; } @@ -2800,9 +2797,9 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) return; /* If we cannot allocate MSIx vectors use only one rx queue */ - netdev_info(adapter->netdev, - "Failed to enable MSI-X, error %d . Limiting #rx queues to 1, try MSI.\n", - err); + dev_info(&adapter->pdev->dev, + "Failed to enable MSI-X, error %d. " + "Limiting #rx queues to 1, try MSI.\n", err); adapter->intr.type = VMXNET3_IT_MSI; }