2021-03-10 08:29:37

by Yue Hu

Subject: [PATCH] scsi: ufs: Remove unnecessary ret in ufshcd_populate_vreg()

From: Yue Hu <[email protected]>

The local variable _ret_ is always zero, so we can remove it and just
return 0 directly in the end.

Signed-off-by: Yue Hu <[email protected]>
---
drivers/scsi/ufs/ufshcd-pltfrm.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c
index 1a69949..fedb7de 100644
--- a/drivers/scsi/ufs/ufshcd-pltfrm.c
+++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
@@ -106,7 +106,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
static int ufshcd_populate_vreg(struct device *dev, const char *name,
struct ufs_vreg **out_vreg)
{
- int ret = 0;
char prop_name[MAX_PROP_SIZE];
struct ufs_vreg *vreg = NULL;
struct device_node *np = dev->of_node;
@@ -135,9 +134,8 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name,
vreg->max_uA = 0;
}
out:
- if (!ret)
- *out_vreg = vreg;
- return ret;
+ *out_vreg = vreg;
+ return 0;
}

/**
--
1.9.1

2021-03-19 03:49:43

by Martin K. Petersen

Subject: Re: [PATCH] scsi: ufs: Remove unnecessary ret in ufshcd_populate_vreg()

On Wed, 10 Mar 2021 16:27:41 +0800, Yue Hu wrote:

> The local variable _ret_ is always zero, so we can remove it and just
> return 0 directly in the end.

Applied to 5.13/scsi-queue, thanks!

[1/1] scsi: ufs: Remove unnecessary ret in ufshcd_populate_vreg()
https://git.kernel.org/mkp/scsi/c/2a8561b78e37

--
Martin K. Petersen Oracle Linux Engineering