aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorBreno Leitao <leitao@linux.vnet.ibm.com>2009-02-03 18:15:15 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-03 18:15:15 -0500
commit073a24364fe6de7eef0a3dec0ec7d48e56624092 (patch)
treec0ff144ce5dbb6be78c7eaab50b6fcab6e78687b /drivers/net/s2io.c
parent3834507d0c5480a0f05486c2fb57ed18fd179a83 (diff)
s2io: Formatting log message
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index e0a353f4ec92..5cd2291bc0bc 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)
3862 ret = pci_enable_msix(nic->pdev, nic->entries, nic->num_entries); 3862 ret = pci_enable_msix(nic->pdev, nic->entries, nic->num_entries);
3863 /* We fail init if error or we get less vectors than min required */ 3863 /* We fail init if error or we get less vectors than min required */
3864 if (ret) { 3864 if (ret) {
3865 DBG_PRINT(ERR_DBG, "%s: Enabling MSIX failed\n", nic->dev->name); 3865 DBG_PRINT(ERR_DBG, "s2io: Enabling MSI-X failed\n");
3866 kfree(nic->entries); 3866 kfree(nic->entries);
3867 nic->mac_control.stats_info->sw_stat.mem_freed 3867 nic->mac_control.stats_info->sw_stat.mem_freed
3868 += (nic->num_entries * sizeof(struct msix_entry)); 3868 += (nic->num_entries * sizeof(struct msix_entry));
@@ -8010,8 +8010,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
8010 if (ret) { 8010 if (ret) {
8011 8011
8012 DBG_PRINT(ERR_DBG, 8012 DBG_PRINT(ERR_DBG,
8013 "%s: MSI-X requested but failed to enable\n", 8013 "s2io: MSI-X requested but failed to enable\n");
8014 dev->name);
8015 sp->config.intr_type = INTA; 8014 sp->config.intr_type = INTA;
8016 } 8015 }
8017 } 8016 }