diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-06-03 22:19:18 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-04 06:28:21 -0400 |
commit | 74adfee53b8f05b4a9db0848d19399db2cef6cbf (patch) | |
tree | 0bd912d5d8f6005b02a740305435ead089550286 | |
parent | 0d032731178d78450296bdf0b27562476594c298 (diff) |
regulator: max77686: Fix checkpatch warnings
Fix below checkpatch warnings:
$ scripts/checkpatch.pl -f drivers/regulator/max77686.c
ERROR: return is not a function, parentheses are not required
+ return (DIV_ROUND_UP(rdev->desc->uV_step
WARNING: line over 80 characters
+ .ops = &max77686_buck_dvs_ops, \
total: 1 errors, 1 warnings, 339 lines checked
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | drivers/regulator/max77686.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 4e9f4f3f062b..b76a0389d0b8 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c | |||
@@ -75,17 +75,18 @@ static int max77686_set_dvs_voltage_time_sel(struct regulator_dev *rdev, | |||
75 | { | 75 | { |
76 | struct max77686_data *max77686 = rdev_get_drvdata(rdev); | 76 | struct max77686_data *max77686 = rdev_get_drvdata(rdev); |
77 | int ramp_rate[] = {13, 27, 55, 100}; | 77 | int ramp_rate[] = {13, 27, 55, 100}; |
78 | return (DIV_ROUND_UP(rdev->desc->uV_step | 78 | |
79 | * abs(new_selector - old_selector), | 79 | return DIV_ROUND_UP(rdev->desc->uV_step * |
80 | ramp_rate[max77686->ramp_delay])); | 80 | abs(new_selector - old_selector), |
81 | ramp_rate[max77686->ramp_delay]); | ||
81 | } | 82 | } |
82 | 83 | ||
83 | static int max77686_set_voltage_time_sel(struct regulator_dev *rdev, | 84 | static int max77686_set_voltage_time_sel(struct regulator_dev *rdev, |
84 | unsigned int old_selector, unsigned int new_selector) | 85 | unsigned int old_selector, unsigned int new_selector) |
85 | { | 86 | { |
86 | /* Unconditionally 100 mV/us */ | 87 | /* Unconditionally 100 mV/us */ |
87 | return (DIV_ROUND_UP(rdev->desc->uV_step | 88 | return DIV_ROUND_UP(rdev->desc->uV_step * |
88 | * abs(new_selector - old_selector), 100)); | 89 | abs(new_selector - old_selector), 100); |
89 | } | 90 | } |
90 | 91 | ||
91 | static struct regulator_ops max77686_ops = { | 92 | static struct regulator_ops max77686_ops = { |
@@ -171,7 +172,7 @@ static struct regulator_ops max77686_buck_dvs_ops = { | |||
171 | #define regulator_desc_buck_dvs(num) { \ | 172 | #define regulator_desc_buck_dvs(num) { \ |
172 | .name = "BUCK"#num, \ | 173 | .name = "BUCK"#num, \ |
173 | .id = MAX77686_BUCK##num, \ | 174 | .id = MAX77686_BUCK##num, \ |
174 | .ops = &max77686_buck_dvs_ops, \ | 175 | .ops = &max77686_buck_dvs_ops, \ |
175 | .type = REGULATOR_VOLTAGE, \ | 176 | .type = REGULATOR_VOLTAGE, \ |
176 | .owner = THIS_MODULE, \ | 177 | .owner = THIS_MODULE, \ |
177 | .min_uV = MAX77686_DVS_MINUV, \ | 178 | .min_uV = MAX77686_DVS_MINUV, \ |