openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: core: Fix checkpatch issue 

Fix the following checkpatch errors and warnings.

  ERROR: trailing whitespace
  ERROR: return is not a function, parentheses are not required
  WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jingoo Han 2014-01-08 10:02:16 +09:00 committed by Mark Brown
parent 0781719bd6
commit 0d25d09de1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/regulator/core.c
View File

@ -1334,9 +1334,8 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
* If we have return value from dev_lookup fail, we do not expect to * If we have return value from dev_lookup fail, we do not expect to
* succeed, so, quit with appropriate error value * succeed, so, quit with appropriate error value
*/ */
if (ret && ret != -ENODEV) { if (ret && ret != -ENODEV)
goto out; goto out;
}
if (!devname) if (!devname)
devname = "deviceless"; devname = "deviceless";
@ -2245,7 +2244,7 @@ int regulator_is_supported_voltage(struct regulator *regulator,
if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) { if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {
ret = regulator_get_voltage(regulator); ret = regulator_get_voltage(regulator);
if (ret >= 0) if (ret >= 0)
return (min_uV <= ret && ret <= max_uV); return min_uV <= ret && ret <= max_uV;
else else
return ret; return ret;
} }
@ -2417,7 +2416,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
ret = regulator_check_voltage(rdev, &min_uV, &max_uV); ret = regulator_check_voltage(rdev, &min_uV, &max_uV);
if (ret < 0) if (ret < 0)
goto out; goto out;
/* restore original values in case of error */ /* restore original values in case of error */
old_min_uV = regulator->min_uV; old_min_uV = regulator->min_uV;
old_max_uV = regulator->max_uV; old_max_uV = regulator->max_uV;
@ -2431,7 +2430,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
ret = _regulator_do_set_voltage(rdev, min_uV, max_uV); ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);
if (ret < 0) if (ret < 0)
goto out2; goto out2;
out: out:
mutex_unlock(&rdev->mutex); mutex_unlock(&rdev->mutex);
return ret; return ret;
@ -3836,9 +3835,8 @@ static int __init regulator_init_complete(void)
* goes wrong. */ * goes wrong. */
rdev_info(rdev, "disabling\n"); rdev_info(rdev, "disabling\n");
ret = ops->disable(rdev); ret = ops->disable(rdev);
if (ret != 0) { if (ret != 0)
rdev_err(rdev, "couldn't disable: %d\n", ret); rdev_err(rdev, "couldn't disable: %d\n", ret);
}
} else { } else {
/* The intention is that in future we will /* The intention is that in future we will
* assume that full constraints are provided * assume that full constraints are provided