staging: phy-hi3670-usb3: do a some minor cleanups

Before moving this driver out of staging:

1. group some integers altogether;

2. Use:

	return some_function()

instead of:

	ret = some_function();
	return ret;

This is just a cleanup. No functional changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/55db419e42fd3af72494acbe0ea0f0d1de8906ac.1624542940.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/hikey9xx/phy-hi3670-usb3.c b/drivers/staging/hikey9xx/phy-hi3670-usb3.c
index e7e579ce0302d215a8cbec73b17e99857584e471..b9ffe08abaab4d7b02d12d43ee5813e34cdaed6e 100644 (file)
--- a/drivers/staging/hikey9xx/phy-hi3670-usb3.c
+++ b/drivers/staging/hikey9xx/phy-hi3670-usb3.c
@@ -148,10 +148,8 @@ static int hi3670_phy_cr_clk(struct regmap *usb31misc)
                return ret;
 
        /* Clock down */
-       ret = regmap_update_bits(usb31misc, USB_MISC_CFG54,
-                                CFG54_USB31PHY_CR_CLK, 0);
-
-       return ret;
+       return regmap_update_bits(usb31misc, USB_MISC_CFG54,
+                                 CFG54_USB31PHY_CR_CLK, 0);
 }
 
 static int hi3670_phy_cr_set_sel(struct regmap *usb31misc)
@@ -215,17 +213,14 @@ static int hi3670_phy_cr_set_addr(struct regmap *usb31misc, u32 addr)
                return ret;
 
        reg = FIELD_PREP(CFG54_USB31PHY_CR_ADDR_MASK, addr);
-       ret = regmap_update_bits(usb31misc, USB_MISC_CFG54,
-                                CFG54_USB31PHY_CR_ADDR_MASK, reg);
 
-       return ret;
+       return regmap_update_bits(usb31misc, USB_MISC_CFG54,
+                                 CFG54_USB31PHY_CR_ADDR_MASK, reg);
 }
 
 static int hi3670_phy_cr_read(struct regmap *usb31misc, u32 addr, u32 *val)
 {
-       int reg;
-       int i;
-       int ret;
+       int reg, i, ret;
 
        for (i = 0; i < 100; i++) {
                ret = hi3670_phy_cr_clk(usb31misc);
@@ -286,9 +281,7 @@ static int hi3670_phy_cr_write(struct regmap *usb31misc, u32 addr, u32 val)
        if (ret)
                return ret;
 
-       ret = hi3670_phy_cr_wait_ack(usb31misc);
-
-       return ret;
+       return hi3670_phy_cr_wait_ack(usb31misc);
 }
 
 static int hi3670_phy_set_params(struct hi3670_priv *priv)