Patchwork [24/33] sfc: Fix format arguments for warning about MSI-X allocation

login
register
mail settings
Submitter Ben Hutchings
Date Dec. 12, 2008, 12:56 p.m.
Message ID <20081212125637.GX10372@solarflare.com>
Download mbox | patch
Permalink /patch/13726/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ben Hutchings - Dec. 12, 2008, 12:56 p.m.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/sfc/efx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Ben Hutchings - Dec. 12, 2008, 8:34 p.m.
On Fri, 2008-12-12 at 12:56 +0000, Ben Hutchings wrote:
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
> ---
>  drivers/net/sfc/efx.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
> index b99ccfb..ce1c7d3 100644
> --- a/drivers/net/sfc/efx.c
> +++ b/drivers/net/sfc/efx.c
> @@ -899,7 +899,7 @@ static void efx_probe_interrupts(struct efx_nic *efx)
>  		rc = pci_enable_msix(efx->pci_dev, xentries, wanted_ints);
>  		if (rc > 0) {
>  			EFX_ERR(efx, "WARNING: Insufficient MSI-X vectors"
> -				" available (%d < %d).\n", wanted_ints, rc);
> +				" available (%d < %d).\n", rc, wanted_ints);
>  			EFX_ERR(efx, "WARNING: Performance may be reduced.\n");
>  			EFX_BUG_ON_PARANOID(rc >= wanted_ints);
>  			wanted_ints = rc;

I thought this warning was already present, but it is actually
introduced by patch 10/33.  There's no point in introducing it wrongly,
so please combine the two.  Or I can post the combined patch myself.

Ben.
David Miller - Dec. 13, 2008, 5:25 a.m.
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 12 Dec 2008 20:34:47 +0000

> I thought this warning was already present, but it is actually
> introduced by patch 10/33.  There's no point in introducing it wrongly,
> so please combine the two.  Or I can post the combined patch myself.

I'll take care of this, thanks Ben.
--
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

Patch

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index b99ccfb..ce1c7d3 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -899,7 +899,7 @@  static void efx_probe_interrupts(struct efx_nic *efx)
 		rc = pci_enable_msix(efx->pci_dev, xentries, wanted_ints);
 		if (rc > 0) {
 			EFX_ERR(efx, "WARNING: Insufficient MSI-X vectors"
-				" available (%d < %d).\n", wanted_ints, rc);
+				" available (%d < %d).\n", rc, wanted_ints);
 			EFX_ERR(efx, "WARNING: Performance may be reduced.\n");
 			EFX_BUG_ON_PARANOID(rc >= wanted_ints);
 			wanted_ints = rc;