* [PATCH] vmxnet3: Fix log messages and corrects some typos
@ 2012-02-29 6:55 Shreyas Bhatewara
2012-02-29 7:02 ` Joe Perches
0 siblings, 1 reply; 4+ messages in thread
From: Shreyas Bhatewara @ 2012-02-29 6:55 UTC (permalink / raw)
To: netdev; +Cc: pv-drivers, petr
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 <sbhatewara@vmware.com>
---
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index de7fc34..51ec299 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_info(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_info(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,8 @@ 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;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] vmxnet3: Fix log messages and corrects some typos
2012-02-29 6:55 [PATCH] vmxnet3: Fix log messages and corrects some typos Shreyas Bhatewara
@ 2012-02-29 7:02 ` Joe Perches
2012-02-29 8:08 ` Shreyas Bhatewara
0 siblings, 1 reply; 4+ messages in thread
From: Joe Perches @ 2012-02-29 7:02 UTC (permalink / raw)
To: Shreyas Bhatewara; +Cc: netdev, pv-drivers, petr
On Tue, 2012-02-28 at 22:55 -0800, Shreyas Bhatewara wrote:
> Fix log messages and corrects some typos
Please don't split formats.
> diff --git 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_info(adapter->netdev, "Failed to enable MSI-X, "
> + "error: %d\n", err);
Why change from err to info?
And perhaps this is better as:
netdev_err(adapter->netdev,
"Failed to enable MSI-X for %s, error: %d\n",
err);
[]
> @@ -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_info(adapter->netdev, "Failed to enable %d MSI-X"
> + ", trying %d instead\n", vectors,
> + 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");
This is an example of why not to split formats.
You added 2 spaces between be and allocated.
> return err;
> }
>
> @@ -2792,8 +2792,8 @@ 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);
Need a space after %d.
cheers, Joe
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] vmxnet3: Fix log messages and corrects some typos
2012-02-29 7:02 ` Joe Perches
@ 2012-02-29 8:08 ` Shreyas Bhatewara
2012-03-05 2:38 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Shreyas Bhatewara @ 2012-02-29 8:08 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, pv-drivers, petr
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 <sbhatewara@vmware.com>
Reviewed-by: Joe Perches <joe@perches.com>
---
Resending as per Joe's feedback.
---
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;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] vmxnet3: Fix log messages and corrects some typos
2012-02-29 8:08 ` Shreyas Bhatewara
@ 2012-03-05 2:38 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2012-03-05 2:38 UTC (permalink / raw)
To: sbhatewara; +Cc: joe, netdev, pv-drivers, petr
From: Shreyas Bhatewara <sbhatewara@vmware.com>
Date: Wed, 29 Feb 2012 00:08:39 -0800 (PST)
> 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 <sbhatewara@vmware.com>
> Reviewed-by: Joe Perches <joe@perches.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-05 2:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-29 6:55 [PATCH] vmxnet3: Fix log messages and corrects some typos Shreyas Bhatewara
2012-02-29 7:02 ` Joe Perches
2012-02-29 8:08 ` Shreyas Bhatewara
2012-03-05 2:38 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox