In one case 'rc' is used in the other 'ret', the most use 'err'. Make the latter use the former, id est 'err'. Signed-off-by: Andy Shevchenko --- drivers/net/ethernet/alibaba/eea/eea_adminq.c | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/alibaba/eea/eea_adminq.c b/drivers/net/ethernet/alibaba/eea/eea_adminq.c index 92eeff32b00c..f493afbcc41b 100644 --- a/drivers/net/ethernet/alibaba/eea/eea_adminq.c +++ b/drivers/net/ethernet/alibaba/eea/eea_adminq.c @@ -133,7 +133,7 @@ static int eea_adminq_submit(struct eea_net *enet, u16 cmd, { struct eea_aq_cdesc *cdesc; struct eea_aq_desc *desc; - int ret; + int err; if (enet->adminq.broken) return -EIO; @@ -163,9 +163,9 @@ static int eea_adminq_submit(struct eea_net *enet, u16 cmd, if ((enet->adminq.num % enet->adminq.ring->num) == 0) enet->adminq.phase ^= EEA_RING_DESC_F_AQ_PHASE; - ret = read_poll_timeout(eea_ering_cq_get_desc, cdesc, cdesc, 10, + err = read_poll_timeout(eea_ering_cq_get_desc, cdesc, cdesc, 10, EEA_AQ_TIMEOUT_US, false, enet->adminq.ring); - if (ret) { + if (err) { netdev_err(enet->netdev, "adminq exec timeout. cmd: %d reset device.\n", cmd); @@ -173,21 +173,21 @@ static int eea_adminq_submit(struct eea_net *enet, u16 cmd, * potential DMA writes after the memory is freed. */ eea_device_broken(enet); - return ret; + return err; } /* Returns 0 on success, or a negative error code on failure. */ - ret = le32_to_cpu(cdesc->status); + err = le32_to_cpu(cdesc->status); eea_ering_cq_ack_desc(enet->adminq.ring, 1); - if (ret) + if (err) netdev_err(enet->netdev, - "adminq exec failed. cmd: %d ret %d\n", cmd, ret); + "adminq exec failed. cmd: %d ret %d\n", cmd, err); else *reply_len = le32_to_cpu(cdesc->reply_len); - return ret; + return err; } static int eea_adminq_exec(struct eea_net *enet, u16 cmd, @@ -198,7 +198,7 @@ static int eea_adminq_exec(struct eea_net *enet, u16 cmd, dma_addr_t req_addr = 0, res_addr = 0; struct device *dma; u32 reply_len = 0; - int ret; + int err; if (reply) *reply = 0; @@ -214,19 +214,19 @@ static int eea_adminq_exec(struct eea_net *enet, u16 cmd, if (res) { res_addr = dma_map_single(dma, res, res_size, DMA_FROM_DEVICE); if (unlikely(dma_mapping_error(dma, res_addr))) { - ret = -ENOMEM; + err = -ENOMEM; goto err_unmap_req; } } mutex_lock(&enet->adminq.lock); - ret = eea_adminq_submit(enet, cmd, req_addr, res_addr, + err = eea_adminq_submit(enet, cmd, req_addr, res_addr, req_size, res_size, &reply_len); mutex_unlock(&enet->adminq.lock); if (res) { dma_unmap_single(dma, res_addr, res_size, DMA_FROM_DEVICE); - if (ret) + if (err) memset(res, 0, res_size); else if (res_size > reply_len) memset(res + reply_len, 0, res_size - reply_len); @@ -239,7 +239,7 @@ static int eea_adminq_exec(struct eea_net *enet, u16 cmd, if (req) dma_unmap_single(dma, req_addr, req_size, DMA_TO_DEVICE); - return ret; + return err; } void eea_destroy_adminq(struct eea_net *enet) @@ -484,7 +484,7 @@ void eea_adminq_config_host_info(struct eea_net *enet) struct device *dev = enet->edev->dma_dev; struct eea_aq_host_info_cfg *cfg; struct eea_aq_host_info_rep *rep; - int rc; + int err; cfg = kzalloc_obj(*cfg); if (!cfg) @@ -515,9 +515,9 @@ void eea_adminq_config_host_info(struct eea_net *enet) strscpy(cfg->os_ver_str, utsname()->release, sizeof(cfg->os_ver_str)); strscpy(cfg->isa_str, utsname()->machine, sizeof(cfg->isa_str)); - rc = eea_adminq_exec(enet, EEA_AQ_CMD_HOST_INFO, - cfg, sizeof(*cfg), rep, sizeof(*rep), NULL); - if (rc) + err = eea_adminq_exec(enet, EEA_AQ_CMD_HOST_INFO, + cfg, sizeof(*cfg), rep, sizeof(*rep), NULL); + if (err) goto err_free_rep; if (rep->op_code == EEA_HINFO_REP_BAD) -- 2.50.1