diff --git a/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c b/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c index 5cb7cb37334bf284fd406605d60b7e962b8cb9a3..e9f9f0a392abbaf957c384f0ecbf386ae34ebfc6 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c @@ -278,8 +278,7 @@ void hinic_free_cmd_buf(void *hwdev, struct hinic_cmd_buf *cmd_buf) struct hinic_cmdqs *cmdqs; if (!hwdev || !cmd_buf) { - pr_err("Failed to free cmd buf: hwdev: %p, cmd_buf: %p\n", - hwdev, cmd_buf); + pr_err("Failed to free cmd buf.\n"); return; } @@ -892,8 +891,7 @@ static int cmdq_set_arm_bit(struct hinic_cmdq *cmdq, void *buf_in, u16 in_size) static int cmdq_params_valid(void *hwdev, struct hinic_cmd_buf *buf_in) { if (!buf_in || !hwdev) { - pr_err("Invalid CMDQ buffer addr: %p or hwdev: %p\n", - buf_in, hwdev); + pr_err("Invalid CMDQ buffer addr\n"); return -EINVAL; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_dbgtool_knl.c b/drivers/net/ethernet/huawei/hinic/hinic_dbgtool_knl.c index 82f1ec34b944bf8cb6da2f291bdd9a2cacdfbcda..ff43c04ba7400e921470ceea03e002707da5ab4b 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_dbgtool_knl.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_dbgtool_knl.c @@ -116,7 +116,7 @@ int hinic_mem_mmap(struct file *filp, struct vm_area_struct *vma) } if (offset && offset != g_card_phy_addr[card_id]) { - pr_err("offset is invalid, offset addr %llx\n", offset); + pr_err("offset is invalid\n"); return -EAGAIN; } /* old version of tool set vma->vm_pgoff to 0 */ @@ -280,7 +280,7 @@ void chipif_get_all_pf_dev_info(struct pf_dev_info *dev_info, int card_idx, struct hinic_hwdev *hwdev; if (!dev_info) { - pr_err("Params error! dev_info:%p\n", dev_info); + pr_err("Params error!\n"); return; } @@ -341,8 +341,7 @@ long dbgtool_knl_pf_dev_info_get(struct dbgtool_param *para, g_card_phy_addr[card_id] = virt_to_phys(g_card_vir_addr[card_id]); if (!g_card_phy_addr[card_id]) { - pr_err("phy addr for card %d is 0, vir_addr: 0x%llx\n", - card_id, g_card_vir_addr[card_id]); + pr_err("phy addr for card %d is 0\n", card_id); free_pages((unsigned long)g_card_vir_addr[card_id], DBGTOOL_PAGE_ORDER); g_card_vir_addr[card_id] = NULL; diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hwif.c b/drivers/net/ethernet/huawei/hinic/hinic_hwif.c index def8c2b08eae0f7b49c583263896f34611ddec8a..fad2d6d9459d7b738aefa4e7ea4057ed94fde1f1 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hwif.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_hwif.c @@ -552,7 +552,6 @@ int hinic_init_hwif(struct hinic_hwdev *hwdev, void *cfg_reg_base, hwif->cfg_regs_base = cfg_reg_base; hwif->intr_regs_base = intr_reg_base; - pr_info("init intr_regs_base=%p", hwif->intr_regs_base); hwif->db_base_phy = db_base_phy; hwif->db_base = db_base; diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c index 387752b7f3676a56084433dc485a36997b0cddea..936c1e5115e9ff205aea9e77b239f1446b75dba3 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c @@ -1025,8 +1025,8 @@ static int __get_card_usr_api_chain_mem(int card_idx) (void *)__get_free_pages(GFP_KERNEL, DBGTOOL_PAGE_ORDER); if (!g_card_vir_addr[card_idx]) { - pr_err("Alloc api chain memory fail for card %d, virt_addr: %p!\n", - card_idx, g_card_vir_addr[card_idx]); + pr_err("Alloc api chain memory fail for card %d.\n", + card_idx); mutex_unlock(&g_addr_lock); return -EFAULT; } @@ -1037,8 +1037,7 @@ static int __get_card_usr_api_chain_mem(int card_idx) g_card_phy_addr[card_idx] = virt_to_phys(g_card_vir_addr[card_idx]); if (!g_card_phy_addr[card_idx]) { - pr_err("phy addr for card %d is 0, vir_addr: 0x%p\n", - card_idx, g_card_vir_addr[card_idx]); + pr_err("phy addr for card %d is 0.\n", card_idx); free_pages((unsigned long)g_card_vir_addr[card_idx], DBGTOOL_PAGE_ORDER); g_card_vir_addr[card_idx] = NULL;