2020-12-09 09:24:40

by Zheng Yongjun

Subject: [PATCH net-next] net: cisco: enic: simplify the return vnic_cq_alloc()

Simplify the return expression.

Signed-off-by: Zheng Yongjun <[email protected]>
---
drivers/net/ethernet/cisco/enic/vnic_cq.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/vnic_cq.c b/drivers/net/ethernet/cisco/enic/vnic_cq.c
index 9c682aff3834..519323460f26 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_cq.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_cq.c
@@ -36,8 +36,6 @@ void vnic_cq_free(struct vnic_cq *cq)
int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
unsigned int desc_count, unsigned int desc_size)
{
- int err;
-
cq->index = index;
cq->vdev = vdev;

@@ -47,11 +45,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
return -EINVAL;
}

- err = vnic_dev_alloc_desc_ring(vdev, &cq->ring, desc_count, desc_size);
- if (err)
- return err;
-
- return 0;
+ return vnic_dev_alloc_desc_ring(vdev, &cq->ring, desc_count, desc_size);
}

void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
--
2.22.0

2020-12-10 01:19:11

by David Miller

Subject: Re: [PATCH net-next] net: cisco: enic: simplify the return vnic_cq_alloc()

From: Zheng Yongjun <[email protected]>
Date: Wed, 9 Dec 2020 17:20:31 +0800

> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <[email protected]>

Applied.