regulator: core: Fix checkpatch issue
Subsystems (2)
PATCH 1/3 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
--- drivers/regulator/core.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/regulator/core.c +5 -7
@@ -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 * succeed, so, quit with appropriate error value */ -if (ret && ret != -ENODEV ) { +if (ret && ret != -ENODEV ) goto out; - }if (!devname) devname ="deviceless" ;
@@ -2245,7 +2244,7 @@ int regulator_is_supported_voltage(struct regulator *regulator,if (!(rdev->constraints->valid_ops_mask ®ULATOR_CHANGE_VOLTAGE )) { ret =regulator_get_voltage (regulator);if (ret >=0 ) -return (min_uV <= ret && ret <= max_uV); +return min_uV <= ret && ret <= max_uV;else 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);if (ret <0 ) goto out; - +/* restore original values in case of error */ old_min_uV = regulator->min_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);if (ret <0 ) goto out2; - + out:mutex_unlock (&rdev->mutex);return ret;
@@ -3836,9 +3835,8 @@ static int __init regulator_init_complete(void)* goes wrong. */ rdev_info (rdev,"disabling\n" ); ret = ops->disable (rdev); -if (ret !=0 ) { +if (ret !=0 )rdev_err (rdev,"couldn't disable: %d\n" , ret); - } }else {/* The intention is that in future we will * assume that full constraints are provided
Signature · 1 line
1.7.10.4
PATCH 2/3 regulator: mc13892: Fix checkpatch issue
Fix the following checkpatch warnings.
WARNING: Avoid unnecessary line continuations
WARNING: line over 80 characters
--- drivers/regulator/mc13892-regulator.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/regulator/mc13892-regulator.c +12 -12
@@ -274,25 +274,25 @@ static struct mc13xxx_regulator mc13892_regulators[] = {MC13892_SW_DEFINE (SW4 ,SWITCHERS3 ,SWITCHERS3 , mc13892_sw),MC13892_FIXED_DEFINE (SWBST ,SWITCHERS5 , mc13892_swbst),MC13892_FIXED_DEFINE (VIOHI ,REGULATORMODE0 , mc13892_viohi), -MC13892_DEFINE_REGU (VPLL ,REGULATORMODE0 ,REGULATORSETTING0 , \ +MC13892_DEFINE_REGU (VPLL ,REGULATORMODE0 ,REGULATORSETTING0 , mc13892_vpll), -MC13892_DEFINE_REGU (VDIG ,REGULATORMODE0 ,REGULATORSETTING0 , \ +MC13892_DEFINE_REGU (VDIG ,REGULATORMODE0 ,REGULATORSETTING0 , mc13892_vdig), -MC13892_DEFINE_REGU (VSD ,REGULATORMODE1 ,REGULATORSETTING1 , \ +MC13892_DEFINE_REGU (VSD ,REGULATORMODE1 ,REGULATORSETTING1 , mc13892_vsd), -MC13892_DEFINE_REGU (VUSB2 ,REGULATORMODE0 ,REGULATORSETTING0 , \ +MC13892_DEFINE_REGU (VUSB2 ,REGULATORMODE0 ,REGULATORSETTING0 , mc13892_vusb2), -MC13892_DEFINE_REGU (VVIDEO ,REGULATORMODE1 ,REGULATORSETTING1 , \ +MC13892_DEFINE_REGU (VVIDEO ,REGULATORMODE1 ,REGULATORSETTING1 , mc13892_vvideo), -MC13892_DEFINE_REGU (VAUDIO ,REGULATORMODE1 ,REGULATORSETTING1 , \ +MC13892_DEFINE_REGU (VAUDIO ,REGULATORMODE1 ,REGULATORSETTING1 , mc13892_vaudio), -MC13892_DEFINE_REGU (VCAM ,REGULATORMODE1 ,REGULATORSETTING0 , \ +MC13892_DEFINE_REGU (VCAM ,REGULATORMODE1 ,REGULATORSETTING0 , mc13892_vcam), -MC13892_DEFINE_REGU (VGEN1 ,REGULATORMODE0 ,REGULATORSETTING0 , \ +MC13892_DEFINE_REGU (VGEN1 ,REGULATORMODE0 ,REGULATORSETTING0 , mc13892_vgen1), -MC13892_DEFINE_REGU (VGEN2 ,REGULATORMODE0 ,REGULATORSETTING0 , \ +MC13892_DEFINE_REGU (VGEN2 ,REGULATORMODE0 ,REGULATORSETTING0 , mc13892_vgen2), -MC13892_DEFINE_REGU (VGEN3 ,REGULATORMODE1 ,REGULATORSETTING0 , \ +MC13892_DEFINE_REGU (VGEN3 ,REGULATORMODE1 ,REGULATORSETTING0 , mc13892_vgen3),MC13892_FIXED_DEFINE (VUSB ,USB1 , mc13892_vusb), MC13892_GPO_DEFINE(GPO1, POWERMISC, mc13892_gpo),
@@ -476,8 +476,8 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev, }mc13xxx_lock (priv->mc13xxx); - ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13892_regulators[id].vsel_reg, mask, - reg_value); + ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13892_regulators[id].vsel_reg, + mask, reg_value);mc13xxx_unlock (priv->mc13xxx);return ret;
Signature · 1 line
1.7.10.4
Mark Brown
maintainerRe: [PATCH 2/3] regulator: mc13892: Fix checkpatch issue
Quoted 4 lines · Jingoo Han
Fix the following checkpatch warnings.
WARNING: Avoid unnecessary line continuations
WARNING: line over 80 characters
This doesn't apply against current code, the same changes have already been made by you in October.
Re: [PATCH 2/3] regulator: mc13892: Fix checkpatch issue
Quoted 8 lines · Mark Brown
Quoted 4 lines · Jingoo Han
Fix the following checkpatch warnings.
WARNING: Avoid unnecessary line continuations
WARNING: line over 80 charactersThis doesn't apply against current code, the same changes have already been made by you in October.
Sorry for annoying you.
I checked this patch applied to 'mc13892' branch in regulator git tree. Thank you. :-)
Happy New Year!
Best regards,
Jingoo Han
PATCH 3/3 regulator: twl: Fix checkpatch issue
In reply to Jingoo HanFix the following checkpatch warnings.
WARNING: please, no space before tabs
WARNING: space prohibited between function name and open parenthesis '('
--- drivers/regulator/twl-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/twl-regulator.c +2 -2
@@ -58,7 +58,7 @@ struct twlreg_info {struct regulator_desc desc;/* chip specific features */ -unsigned long features; +unsigned long features;/* * optional override functions for voltage set/get
@@ -1128,7 +1128,7 @@ static int twlreg_probe(struct platform_device *pdev)if (!initdata)return -EINVAL ; - info =kmemdup (template,sizeof (*info),GFP_KERNEL ); + info =kmemdup (template,sizeof (*info),GFP_KERNEL );if (!info)return -ENOMEM ;
Signature · 1 line
1.7.10.4
Re: [PATCH 3/3] regulator: twl: Fix checkpatch issue
Quoted 4 lines · Jingoo Han
Fix the following checkpatch warnings.
WARNING: please, no space before tabs
WARNING: space prohibited between function name and open parenthesis '('
Applied, thanks.
Quoted 1 line · Jingoo Han
Fix the following checkpatch errors and warnings.
Applied, thanks.