From patchwork Wed Feb 29 08:08:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyas Bhatewara X-Patchwork-Id: 143684 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 03DDFB6ED0 for ; Wed, 29 Feb 2012 19:08:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754599Ab2B2IIl (ORCPT ); Wed, 29 Feb 2012 03:08:41 -0500 Received: from smtp-outbound-1.vmware.com ([208.91.2.12]:53723 "EHLO smtp-outbound-1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309Ab2B2IIk (ORCPT ); Wed, 29 Feb 2012 03:08:40 -0500 Received: from sc9-mailhost2.vmware.com (sc9-mailhost2.vmware.com [10.113.161.72]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id CCE682832F; Wed, 29 Feb 2012 00:08:39 -0800 (PST) Received: from sbhatewara-dev1.eng.vmware.com (sbhatewara-dev1.eng.vmware.com [10.20.113.123]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id C65BCB0096; Wed, 29 Feb 2012 00:08:39 -0800 (PST) Date: Wed, 29 Feb 2012 00:08:39 -0800 (PST) From: Shreyas Bhatewara X-X-Sender: sbhatewara@sbhatewara-dev1.eng.vmware.com To: Joe Perches cc: netdev@vger.kernel.org, pv-drivers@vmware.com, petr@vmware.com Subject: Re: [PATCH] vmxnet3: Fix log messages and corrects some typos In-Reply-To: <1330498925.4352.13.camel@joe2Laptop> Message-ID: References: <1330498925.4352.13.camel@joe2Laptop> User-Agent: Alpine 2.00 (LRH 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix log messages and corrects some typos Change logging of failure to enable MSI/MSI-X to display device's PCI address instead of eth%d. Rectify a typo. Signed-off-by: Shreyas N Bhatewara Reviewed-by: Joe Perches --- Resending as per Joe's feedback. --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index de7fc34..6995d3c 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2709,8 +2709,8 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, adapter->intr.num_intrs = vectors; return 0; } else if (err < 0) { - printk(KERN_ERR "Failed to enable MSI-X for %s, error" - " %d\n", adapter->netdev->name, err); + netdev_err(adapter->netdev, + "Failed to enable MSI-X, error: %d\n", err); vectors = 0; } else if (err < vector_threshold) { break; @@ -2718,15 +2718,15 @@ 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", + vectors, vector_threshold); vectors = vector_threshold; - printk(KERN_ERR "Failed to enable %d MSI-X for %s, try" - " %d instead\n", vectors, adapter->netdev->name, - vector_threshold); } } - printk(KERN_INFO "Number of MSI-X interrupts which can be allocatedi" - " are lower than min threshold required.\n"); + netdev_info(adapter->netdev, + "Number of MSI-X interrupts which can be allocated are lower than min threshold required.\n"); return err; } @@ -2792,8 +2792,9 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) return; /* If we cannot allocate MSIx vectors use only one rx queue */ - printk(KERN_INFO "Failed to enable MSI-X for %s, error %d." - "#rx queues : 1, try MSI\n", adapter->netdev->name, err); + netdev_info(adapter->netdev, + "Failed to enable MSI-X, error %d . Limiting #rx queues to 1, try MSI.\n", + err); adapter->intr.type = VMXNET3_IT_MSI; }