diff options
author | Breno Leitao <leitao@linux.vnet.ibm.com> | 2010-03-04 05:40:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-05 17:00:19 -0500 |
commit | 3a22813a5aaf8e8c72be575dabe0ba26f9352f4d (patch) | |
tree | 1fb39d81f4bcad55d0ad2ee94b24530b34557f11 /drivers | |
parent | a80483d3722b603dae8a52495f8d88a7d4b1bf1c (diff) |
s2io: Fixing debug message
Currently s2io is dumping debug messages using the interface name
before it was allocated, showing a message like the following:
s2io: eth%d: Ring Mem PHY: 0x7ef80000
s2io: s2io_reset: Resetting XFrame card eth%d
This patch just fixes it, printing the pci bus information for
the card instead of the interface name.
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/s2io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 43bc66aa8405..df70657260dd 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -923,8 +923,8 @@ static int init_shared_mem(struct s2io_nic *nic) | |||
923 | tmp_v_addr = mac_control->stats_mem; | 923 | tmp_v_addr = mac_control->stats_mem; |
924 | mac_control->stats_info = (struct stat_block *)tmp_v_addr; | 924 | mac_control->stats_info = (struct stat_block *)tmp_v_addr; |
925 | memset(tmp_v_addr, 0, size); | 925 | memset(tmp_v_addr, 0, size); |
926 | DBG_PRINT(INIT_DBG, "%s: Ring Mem PHY: 0x%llx\n", dev->name, | 926 | DBG_PRINT(INIT_DBG, "%s: Ring Mem PHY: 0x%llx\n", |
927 | (unsigned long long)tmp_p_addr); | 927 | dev_name(&nic->pdev->dev), (unsigned long long)tmp_p_addr); |
928 | mac_control->stats_info->sw_stat.mem_allocated += mem_allocated; | 928 | mac_control->stats_info->sw_stat.mem_allocated += mem_allocated; |
929 | return SUCCESS; | 929 | return SUCCESS; |
930 | } | 930 | } |
@@ -3480,7 +3480,7 @@ static void s2io_reset(struct s2io_nic *sp) | |||
3480 | struct swStat *swstats; | 3480 | struct swStat *swstats; |
3481 | 3481 | ||
3482 | DBG_PRINT(INIT_DBG, "%s: Resetting XFrame card %s\n", | 3482 | DBG_PRINT(INIT_DBG, "%s: Resetting XFrame card %s\n", |
3483 | __func__, sp->dev->name); | 3483 | __func__, pci_name(sp->pdev)); |
3484 | 3484 | ||
3485 | /* Back up the PCI-X CMD reg, dont want to lose MMRBC, OST settings */ | 3485 | /* Back up the PCI-X CMD reg, dont want to lose MMRBC, OST settings */ |
3486 | pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd)); | 3486 | pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd)); |