Patchwork [1/1,net-next] s2io: Formatting log message

login
register
mail settings
Submitter Breno Leitao
Date Feb. 3, 2009, 12:39 p.m.
Message ID <49883B07.9030009@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/21724/
State Accepted
Delegated to: David Miller
Headers show

Comments

Breno Leitao - Feb. 3, 2009, 12:39 p.m.
S2IO driver is printing dev->name before the name being allocated, which
display eth%d instead of eth0, eth1, etc. Example: 

eth%d: Enabling MSIX failed
eth%d: MSI-X requested but failed to enable

This patch just change eth%d to s2io.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>

---

--
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
David Miller - Feb. 3, 2009, 11:15 p.m.
From: Breno Leitao <leitao@linux.vnet.ibm.com>
Date: Tue, 03 Feb 2009 10:39:35 -0200

> S2IO driver is printing dev->name before the name being allocated, which
> display eth%d instead of eth0, eth1, etc. Example: 
> 
> eth%d: Enabling MSIX failed
> eth%d: MSI-X requested but failed to enable
> 
> This patch just change eth%d to s2io.
> 
> Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>

Applied, thanks.
--
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/s2io.c b/drivers/net/s2io.c
index f5c57c0..a63a496 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3862,7 +3862,7 @@  static int s2io_enable_msi_x(struct s2io_nic *nic)
 	ret = pci_enable_msix(nic->pdev, nic->entries, nic->num_entries);
 	/* We fail init if error or we get less vectors than min required */
 	if (ret) {
-		DBG_PRINT(ERR_DBG, "%s: Enabling MSIX failed\n", nic->dev->name);
+		DBG_PRINT(ERR_DBG, "s2io: Enabling MSI-X failed\n");
 		kfree(nic->entries);
 		nic->mac_control.stats_info->sw_stat.mem_freed
 			+= (nic->num_entries * sizeof(struct msix_entry));
@@ -8009,8 +8009,7 @@  s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
 		if (ret) {
 
 			DBG_PRINT(ERR_DBG,
-			  "%s: MSI-X requested but failed to enable\n",
-			  dev->name);
+			  "s2io: MSI-X requested but failed to enable\n");
 			sp->config.intr_type = INTA;
 		}
 	}