2020-09-21 08:04:54

by Liu Shixin

Subject: [PATCH -next] [SCSI] fnic: simplify the return expression of vnic_wq_copy_alloc

Simplify the return expression.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/scsi/fnic/vnic_wq_copy.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/scsi/fnic/vnic_wq_copy.c b/drivers/scsi/fnic/vnic_wq_copy.c
index 9eab7e7caf38..7b18635df7e6 100644
--- a/drivers/scsi/fnic/vnic_wq_copy.c
+++ b/drivers/scsi/fnic/vnic_wq_copy.c
@@ -79,8 +79,6 @@ int vnic_wq_copy_alloc(struct vnic_dev *vdev, struct vnic_wq_copy *wq,
unsigned int index, unsigned int desc_count,
unsigned int desc_size)
{
- int err;
-
wq->index = index;
wq->vdev = vdev;
wq->to_use_index = wq->to_clean_index = 0;
@@ -92,11 +90,7 @@ int vnic_wq_copy_alloc(struct vnic_dev *vdev, struct vnic_wq_copy *wq,

vnic_wq_copy_disable(wq);

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

void vnic_wq_copy_init(struct vnic_wq_copy *wq, unsigned int cq_index,
--
2.25.1

2020-10-08 03:08:48

by Martin K. Petersen

Subject: Re: [PATCH -next] [SCSI] fnic: simplify the return expression of vnic_wq_copy_alloc

Liu,

> Simplify the return expression.

Applied to 5.10/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2020-10-14 07:17:24

by Martin K. Petersen

Subject: Re: [PATCH -next] [SCSI] fnic: simplify the return expression of vnic_wq_copy_alloc

On Mon, 21 Sep 2020 16:24:52 +0800, Liu Shixin wrote:

> Simplify the return expression.

Applied to 5.10/scsi-queue, thanks!

[1/1] scsi: fnic: Simplify the return expression of vnic_wq_copy_alloc()
https://git.kernel.org/mkp/scsi/c/39d0c6e770c2

--
Martin K. Petersen Oracle Linux Engineering