[PATCH v5 08/21] staging: hikey9xx: hi6421v600-regulator: do some cleanups

[Mauro Carvalho Chehab]

In preparation for de-staging, do some cleanups:

- Return error codes from hi6421_spmi_pmic_rmw();
- Remove a debug message;
- Change the module description;
- a few minor coding style adjustments.

Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>
---
 .../staging/hikey9xx/hi6421v600-regulator.c   | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c 
b/drivers/staging/hikey9xx/hi6421v600-regulator.c
index e25e596f58cf..564d86f0e4dc 100644
--- a/drivers/staging/hikey9xx/hi6421v600-regulator.c
+++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c
@@ -117,6 +117,7 @@ static int hi6421_spmi_regulator_enable(struct 
regulator_dev *rdev)
 {
        struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
        struct hi6421_spmi_pmic *pmic = sreg->pmic;
+       int ret;
 
        /* cannot enable more than one regulator at one time */
        mutex_lock(&sreg->enable_mutex);
@@ -124,13 +125,13 @@ static int hi6421_spmi_regulator_enable(struct 
regulator_dev *rdev)
                     HISI_REGS_ENA_PROTECT_TIME + 1000);
 
        /* set enable register */
-       hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,
-                            rdev->desc->enable_mask,
-                            rdev->desc->enable_mask);
+       ret = hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,
+                                  rdev->desc->enable_mask,
+                                  rdev->desc->enable_mask);
 
        mutex_unlock(&sreg->enable_mutex);
 
-       return 0;
+       return ret;
 }
 
 static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev)
@@ -139,10 +140,8 @@ static int hi6421_spmi_regulator_disable(struct 
regulator_dev *rdev)
        struct hi6421_spmi_pmic *pmic = sreg->pmic;
 
        /* set enable register to 0 */
-       hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,
-                            rdev->desc->enable_mask, 0);
-
-       return 0;
+       return hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,
+                                   rdev->desc->enable_mask, 0);
 }
 
 static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev)
@@ -154,7 +153,7 @@ static int hi6421_spmi_regulator_get_voltage_sel(struct 
regulator_dev *rdev)
        /* get voltage selector */
        reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->vsel_reg);
 
-       return (reg_val & rdev->desc->vsel_mask) >>     
(ffs(rdev->desc->vsel_mask) - 1);
+       return (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) 
- 1);
 }
 
 static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev,
@@ -164,16 +163,14 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct 
regulator_dev *rdev,
        struct hi6421_spmi_pmic *pmic = sreg->pmic;
        u32 reg_val;
 
-       if (unlikely(selector >= rdev->desc->n_voltages))
+       if (selector >= rdev->desc->n_voltages)
                return -EINVAL;
 
        reg_val = selector << (ffs(rdev->desc->vsel_mask) - 1);
 
        /* set voltage selector */
-       hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg,
-                            rdev->desc->vsel_mask, reg_val);
-
-       return 0;
+       return hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg,
+                                   rdev->desc->vsel_mask, reg_val);
 }
 
 static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
@@ -209,10 +206,8 @@ static int hi6421_spmi_regulator_set_mode(struct 
regulator_dev *rdev,
        }
 
        /* set mode */
-       hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,
-                            sreg->eco_mode_mask, val);
-
-       return 0;
+       return hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,
+                                   sreg->eco_mode_mask, val);
 }
 
 static unsigned int
@@ -319,8 +314,6 @@ static int hi6421_spmi_regulator_probe(struct 
platform_device *pdev)
                /* assign per-regulator data */
                info = &regulator_info[i];
 
-               dev_dbg(dev, "adding regulator %s\n", info->desc.name);
-
                config.dev = pdev->dev.parent;
                config.driver_data = sreg;
 
@@ -344,12 +337,12 @@ MODULE_DEVICE_TABLE(platform, 
hi6421_spmi_regulator_table);
 static struct platform_driver hi6421_spmi_regulator_driver = {
        .id_table = hi6421_spmi_regulator_table,
        .driver = {
-               .name   = "hi6421v600-regulator",
+               .name = "hi6421v600-regulator",
        },
        .probe  = hi6421_spmi_regulator_probe,
 };
 module_platform_driver(hi6421_spmi_regulator_driver);
 
-MODULE_DESCRIPTION("Hi6421v600 regulator driver");
+MODULE_DESCRIPTION("Hi6421v600 SPMI regulator driver");
 MODULE_LICENSE("GPL v2");
 
-- 
2.29.2