staging: regulator: hi6421v600-regulator: fix some coding style issues

Fix the remaining issues complained by checkpatch.

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

diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c
index 72f51594b5ff673d5806be9615b8c460121fe5b4..c80dfac1e4c37b1ebdb1fddf810b6f46ba1f77c9 100644 (file)
--- a/drivers/staging/hikey9xx/hi6421v600-regulator.c
+++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c
@@ -40,7 +40,7 @@
 #include <linux/spmi.h>
 
 #define rdev_dbg(rdev, fmt, arg...)    \
-                pr_debug("%s: %s: " fmt, rdev->desc->name, __func__, ##arg)
+                pr_debug("%s: %s: " fmt, (rdev)->desc->name, __func__, ##arg)
 
 struct hi6421v600_regulator {
        struct regulator_desc rdesc;
@@ -105,7 +105,7 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev)
                 rdev->desc->enable_reg, rdev->desc->enable_mask);
 
        hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,
-                     rdev->desc->enable_mask, 0);
+                            rdev->desc->enable_mask, 0);
 
        return 0;
 }
@@ -122,7 +122,7 @@ static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev)
        selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1);
 
        rdev_dbg(rdev,
-               "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n",
+                "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n",
                 rdev->desc->vsel_reg, reg_val, selector,
                rdev->desc->ops->list_voltage(rdev, selector) / 1000);
 
@@ -144,7 +144,7 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev,
 
        /* set voltage selector */
        rdev_dbg(rdev,
-               "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n",
+                "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n",
                 rdev->desc->vsel_reg, rdev->desc->vsel_mask, reg_val,
                 rdev->desc->ops->list_voltage(rdev, selector) / 1000);
 
@@ -169,7 +169,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
                mode = REGULATOR_MODE_NORMAL;
 
        rdev_dbg(rdev,
-               "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n",
+                "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n",
                 rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val,
                 mode == REGULATOR_MODE_IDLE ? "idle" : "normal");
 
@@ -177,7 +177,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
 }
 
 static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,
-                                  unsigned int mode)
+                                         unsigned int mode)
 {
        struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
        struct hi6421_spmi_pmic *pmic = sreg->pmic;
@@ -204,9 +204,10 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,
        return 0;
 }
 
-static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev,
-                                                   int input_uV, int output_uV,
-                                                   int load_uA)
+static unsigned int
+hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev,
+                                      int input_uV, int output_uV,
+                                      int load_uA)
 {
        struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
 
@@ -220,7 +221,7 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev
 }
 
 static int hi6421_spmi_dt_parse(struct platform_device *pdev,
-                        struct hi6421v600_regulator *sreg,
+                               struct hi6421v600_regulator *sreg,
                         struct regulator_desc *rdesc)
 {
        struct device *dev = &pdev->dev;
@@ -256,7 +257,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev,
                sreg->eco_uA = 0;
        } else {
                ret = of_property_read_u32(np, "eco-microamp",
-                                       &sreg->eco_uA);
+                                          &sreg->eco_uA);
                if (ret) {
                        dev_err(dev, "missing eco-microamp property\n");
                        return ret;
@@ -331,8 +332,8 @@ static struct regulator_ops hi6421_spmi_ldo_rops = {
  */
 
 static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev,
-                                   struct device_node *np,
-                                   struct hi6421_spmi_pmic *pmic)
+                                          struct device_node *np,
+                                          struct hi6421_spmi_pmic *pmic)
 {
        struct device *dev = &pdev->dev;
        struct regulator_desc *rdesc;
@@ -404,7 +405,6 @@ probe_end:
        return ret;
 }
 
-
 static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
 {
        struct device *pmic_dev = pdev->dev.parent;