Skip to content

Commit 433e280

Browse files
321lipengdavem330
authored andcommitted
net: hns3: refactor out hclgevf_cmd_convert_err_code()
To improve code readability and maintainability, refactor hclgevf_cmd_convert_err_code() with an array of imp_errcode and common_errno mapping, instead of a bloated switch/case. Signed-off-by: Peng Li <[email protected]> Signed-off-by: Huazhong Tan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1c9a98b commit 433e280

File tree

1 file changed

+27
-28
lines changed

1 file changed

+27
-28
lines changed

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -176,36 +176,35 @@ void hclgevf_cmd_setup_basic_desc(struct hclgevf_desc *desc,
176176
desc->flag &= cpu_to_le16(~HCLGEVF_CMD_FLAG_WR);
177177
}
178178

179+
struct vf_errcode {
180+
u32 imp_errcode;
181+
int common_errno;
182+
};
183+
179184
static int hclgevf_cmd_convert_err_code(u16 desc_ret)
180185
{
181-
switch (desc_ret) {
182-
case HCLGEVF_CMD_EXEC_SUCCESS:
183-
return 0;
184-
case HCLGEVF_CMD_NO_AUTH:
185-
return -EPERM;
186-
case HCLGEVF_CMD_NOT_SUPPORTED:
187-
return -EOPNOTSUPP;
188-
case HCLGEVF_CMD_QUEUE_FULL:
189-
return -EXFULL;
190-
case HCLGEVF_CMD_NEXT_ERR:
191-
return -ENOSR;
192-
case HCLGEVF_CMD_UNEXE_ERR:
193-
return -ENOTBLK;
194-
case HCLGEVF_CMD_PARA_ERR:
195-
return -EINVAL;
196-
case HCLGEVF_CMD_RESULT_ERR:
197-
return -ERANGE;
198-
case HCLGEVF_CMD_TIMEOUT:
199-
return -ETIME;
200-
case HCLGEVF_CMD_HILINK_ERR:
201-
return -ENOLINK;
202-
case HCLGEVF_CMD_QUEUE_ILLEGAL:
203-
return -ENXIO;
204-
case HCLGEVF_CMD_INVALID:
205-
return -EBADR;
206-
default:
207-
return -EIO;
208-
}
186+
struct vf_errcode hclgevf_cmd_errcode[] = {
187+
{HCLGEVF_CMD_EXEC_SUCCESS, 0},
188+
{HCLGEVF_CMD_NO_AUTH, -EPERM},
189+
{HCLGEVF_CMD_NOT_SUPPORTED, -EOPNOTSUPP},
190+
{HCLGEVF_CMD_QUEUE_FULL, -EXFULL},
191+
{HCLGEVF_CMD_NEXT_ERR, -ENOSR},
192+
{HCLGEVF_CMD_UNEXE_ERR, -ENOTBLK},
193+
{HCLGEVF_CMD_PARA_ERR, -EINVAL},
194+
{HCLGEVF_CMD_RESULT_ERR, -ERANGE},
195+
{HCLGEVF_CMD_TIMEOUT, -ETIME},
196+
{HCLGEVF_CMD_HILINK_ERR, -ENOLINK},
197+
{HCLGEVF_CMD_QUEUE_ILLEGAL, -ENXIO},
198+
{HCLGEVF_CMD_INVALID, -EBADR},
199+
};
200+
u32 errcode_count = ARRAY_SIZE(hclgevf_cmd_errcode);
201+
u32 i;
202+
203+
for (i = 0; i < errcode_count; i++)
204+
if (hclgevf_cmd_errcode[i].imp_errcode == desc_ret)
205+
return hclgevf_cmd_errcode[i].common_errno;
206+
207+
return -EIO;
209208
}
210209

211210
/* hclgevf_cmd_send - send command to command queue

0 commit comments

Comments
 (0)