diff --git a/drivers/net/ethernet/huawei/hinic/hinic_cfg.h b/drivers/net/ethernet/huawei/hinic/hinic_cfg.h
index c390525b395eb6705a3dd35517825ad0372a01c0..50d11cc6996b5930092ef7a43259112aa0a4c0ee 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_cfg.h
+++ b/drivers/net/ethernet/huawei/hinic/hinic_cfg.h
@@ -53,8 +53,6 @@ enum {
 #define HOST_VF_NUM         0
 #define HOST_OQID_MASK_VAL  2
 
-//#define MAX_NUM_AEQ         1
-
 /* L2NIC */
 #define L2NIC_SQ_DEPTH      (4 * K_UNIT)
 #define L2NIC_RQ_DEPTH      (4 * K_UNIT)
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_dcb.c b/drivers/net/ethernet/huawei/hinic/hinic_dcb.c
index 96e99e19687e09b26dcdda1bae6a6d986953be95..b356d025c4769ea58088c085ee38298974c7084e 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_dcb.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_dcb.c
@@ -682,37 +682,38 @@ static void hinic_dcbnl_get_pfc_cfg(struct net_device *netdev, int prio,
 	*setting = nic_dev->dcb_cfg.tc_cfg[prio].pfc_en;
 }
 
-static u8 hinic_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)
+static u8 hinic_dcbnl_getcap(struct net_device *netdev, int cap_id,
+			     u8 *dcb_cap)
 {
 	struct hinic_nic_dev *nic_dev = netdev_priv(netdev);
 
-	switch (capid) {
+	switch (cap_id) {
 	case DCB_CAP_ATTR_PG:
-		*cap = true;
+		*dcb_cap = true;
 		break;
 	case DCB_CAP_ATTR_PFC:
-		*cap = true;
+		*dcb_cap = true;
 		break;
 	case DCB_CAP_ATTR_UP2TC:
-		*cap = false;
+		*dcb_cap = false;
 		break;
 	case DCB_CAP_ATTR_PG_TCS:
-		*cap = 0x80;
+		*dcb_cap = 0x80;
 		break;
 	case DCB_CAP_ATTR_PFC_TCS:
-		*cap = 0x80;
+		*dcb_cap = 0x80;
 		break;
 	case DCB_CAP_ATTR_GSP:
-		*cap = true;
+		*dcb_cap = true;
 		break;
 	case DCB_CAP_ATTR_BCN:
-		*cap = false;
+		*dcb_cap = false;
 		break;
 	case DCB_CAP_ATTR_DCBX:
-		*cap = nic_dev->dcbx_cap;
+		*dcb_cap = nic_dev->dcbx_cap;
 		break;
 	default:
-		*cap = false;
+		*dcb_cap = false;
 		break;
 	}