|
@@ -923,8 +923,8 @@ static int init_shared_mem(struct s2io_nic *nic)
|
|
|
tmp_v_addr = mac_control->stats_mem;
|
|
|
mac_control->stats_info = (struct stat_block *)tmp_v_addr;
|
|
|
memset(tmp_v_addr, 0, size);
|
|
|
- DBG_PRINT(INIT_DBG, "%s: Ring Mem PHY: 0x%llx\n", dev->name,
|
|
|
- (unsigned long long)tmp_p_addr);
|
|
|
+ DBG_PRINT(INIT_DBG, "%s: Ring Mem PHY: 0x%llx\n",
|
|
|
+ dev_name(&nic->pdev->dev), (unsigned long long)tmp_p_addr);
|
|
|
mac_control->stats_info->sw_stat.mem_allocated += mem_allocated;
|
|
|
return SUCCESS;
|
|
|
}
|
|
@@ -3480,7 +3480,7 @@ static void s2io_reset(struct s2io_nic *sp)
|
|
|
struct swStat *swstats;
|
|
|
|
|
|
DBG_PRINT(INIT_DBG, "%s: Resetting XFrame card %s\n",
|
|
|
- __func__, sp->dev->name);
|
|
|
+ __func__, pci_name(sp->pdev));
|
|
|
|
|
|
/* Back up the PCI-X CMD reg, dont want to lose MMRBC, OST settings */
|
|
|
pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));
|