Skip to content

L
linux
Commit 7dc6c766 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files
Options

regulator: as3722: Slightly improve readability 

Add a local variable *desc to avoid too many change lines due to over 80
characters.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ce0a383d
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 79 deletions
drivers/regulator/as3722-regulator.c
View file @ 7dc6c766
...@@ -674,49 +674,45 @@ static int as3722_regulator_probe(struct platform_device *pdev) ...@@ -674,49 +674,45 @@ static int as3722_regulator_probe(struct platform_device *pdev)
config.regmap = as3722->regmap; config.regmap = as3722->regmap;
for (id = 0; id < AS3722_REGULATOR_ID_MAX; id++) { for (id = 0; id < AS3722_REGULATOR_ID_MAX; id++) {
struct regulator_desc *desc;
desc = &as3722_regs->desc[id];
reg_config = &as3722_regs->reg_config_data[id]; reg_config = &as3722_regs->reg_config_data[id];
as3722_regs->desc[id].name = as3722_reg_lookup[id].name; desc->name = as3722_reg_lookup[id].name;
as3722_regs->desc[id].supply_name = as3722_reg_lookup[id].sname; desc->supply_name = as3722_reg_lookup[id].sname;
as3722_regs->desc[id].id = as3722_reg_lookup[id].regulator_id; desc->id = as3722_reg_lookup[id].regulator_id;
as3722_regs->desc[id].n_voltages = desc->n_voltages = as3722_reg_lookup[id].n_voltages;
as3722_reg_lookup[id].n_voltages; desc->type = REGULATOR_VOLTAGE;
as3722_regs->desc[id].type = REGULATOR_VOLTAGE; desc->owner = THIS_MODULE;
as3722_regs->desc[id].owner = THIS_MODULE; desc->enable_reg = as3722_reg_lookup[id].enable_reg;
as3722_regs->desc[id].enable_reg = desc->enable_mask = as3722_reg_lookup[id].enable_mask;
as3722_reg_lookup[id].enable_reg; desc->vsel_reg = as3722_reg_lookup[id].vsel_reg;
as3722_regs->desc[id].enable_mask = desc->vsel_mask = as3722_reg_lookup[id].vsel_mask;
as3722_reg_lookup[id].enable_mask;
as3722_regs->desc[id].vsel_reg = as3722_reg_lookup[id].vsel_reg;
as3722_regs->desc[id].vsel_mask =
as3722_reg_lookup[id].vsel_mask;
switch (id) { switch (id) {
case AS3722_REGULATOR_ID_LDO0: case AS3722_REGULATOR_ID_LDO0:
if (reg_config->ext_control) if (reg_config->ext_control)
ops = &as3722_ldo0_extcntrl_ops; ops = &as3722_ldo0_extcntrl_ops;
else else
ops = &as3722_ldo0_ops; ops = &as3722_ldo0_ops;
as3722_regs->desc[id].min_uV = 825000; desc->min_uV = 825000;
as3722_regs->desc[id].uV_step = 25000; desc->uV_step = 25000;
as3722_regs->desc[id].linear_min_sel = 1; desc->linear_min_sel = 1;
as3722_regs->desc[id].enable_time = 500; desc->enable_time = 500;
as3722_regs->desc[id].curr_table = as3722_ldo_current; desc->curr_table = as3722_ldo_current;
as3722_regs->desc[id].n_current_limits = desc->n_current_limits = ARRAY_SIZE(as3722_ldo_current);
ARRAY_SIZE(as3722_ldo_current); desc->csel_reg = as3722_reg_lookup[id].vsel_reg;
as3722_regs->desc[id].csel_reg = desc->csel_mask = AS3722_LDO_ILIMIT_MASK;
as3722_reg_lookup[id].vsel_reg;
as3722_regs->desc[id].csel_mask =
AS3722_LDO_ILIMIT_MASK;
break; break;
case AS3722_REGULATOR_ID_LDO3: case AS3722_REGULATOR_ID_LDO3:
if (reg_config->ext_control) if (reg_config->ext_control)
ops = &as3722_ldo3_extcntrl_ops; ops = &as3722_ldo3_extcntrl_ops;
else else
ops = &as3722_ldo3_ops; ops = &as3722_ldo3_ops;
as3722_regs->desc[id].min_uV = 620000; desc->min_uV = 620000;
as3722_regs->desc[id].uV_step = 20000; desc->uV_step = 20000;
as3722_regs->desc[id].linear_min_sel = 1; desc->linear_min_sel = 1;
as3722_regs->desc[id].enable_time = 500; desc->enable_time = 500;
if (reg_config->enable_tracking) { if (reg_config->enable_tracking) {
ret = as3722_ldo3_set_tracking_mode(as3722_regs, ret = as3722_ldo3_set_tracking_mode(as3722_regs,
id, AS3722_LDO3_MODE_PMOS_TRACKING); id, AS3722_LDO3_MODE_PMOS_TRACKING);
...@@ -733,25 +729,17 @@ static int as3722_regulator_probe(struct platform_device *pdev) ...@@ -733,25 +729,17 @@ static int as3722_regulator_probe(struct platform_device *pdev)
ops = &as3722_ldo6_extcntrl_ops; ops = &as3722_ldo6_extcntrl_ops;
else else
ops = &as3722_ldo6_ops; ops = &as3722_ldo6_ops;
as3722_regs->desc[id].enable_time = 500; desc->enable_time = 500;
as3722_regs->desc[id].bypass_reg = desc->bypass_reg = AS3722_LDO6_VOLTAGE_REG;
AS3722_LDO6_VOLTAGE_REG; desc->bypass_mask = AS3722_LDO_VSEL_MASK;
as3722_regs->desc[id].bypass_mask = desc->bypass_val_on = AS3722_LDO6_VSEL_BYPASS;
AS3722_LDO_VSEL_MASK; desc->bypass_val_off = AS3722_LDO6_VSEL_BYPASS;
as3722_regs->desc[id].bypass_val_on = desc->linear_ranges = as3722_ldo_ranges;
AS3722_LDO6_VSEL_BYPASS; desc->n_linear_ranges = ARRAY_SIZE(as3722_ldo_ranges);
as3722_regs->desc[id].bypass_val_off = desc->curr_table = as3722_ldo_current;
AS3722_LDO6_VSEL_BYPASS; desc->n_current_limits = ARRAY_SIZE(as3722_ldo_current);
as3722_regs->desc[id].linear_ranges = as3722_ldo_ranges; desc->csel_reg = as3722_reg_lookup[id].vsel_reg;
as3722_regs->desc[id].n_linear_ranges = desc->csel_mask = AS3722_LDO_ILIMIT_MASK;
ARRAY_SIZE(as3722_ldo_ranges);
as3722_regs->desc[id].curr_table = as3722_ldo_current;
as3722_regs->desc[id].n_current_limits =
ARRAY_SIZE(as3722_ldo_current);
as3722_regs->desc[id].csel_reg =
as3722_reg_lookup[id].vsel_reg;
as3722_regs->desc[id].csel_mask =
AS3722_LDO_ILIMIT_MASK;
break; break;
case AS3722_REGULATOR_ID_SD0: case AS3722_REGULATOR_ID_SD0:
case AS3722_REGULATOR_ID_SD1: case AS3722_REGULATOR_ID_SD1:
...@@ -770,26 +758,23 @@ static int as3722_regulator_probe(struct platform_device *pdev) ...@@ -770,26 +758,23 @@ static int as3722_regulator_probe(struct platform_device *pdev)
AS3722_SD0_VSEL_MAX + 1; AS3722_SD0_VSEL_MAX + 1;
as3722_regs->desc[id].min_uV = 610000; as3722_regs->desc[id].min_uV = 610000;
} }
as3722_regs->desc[id].uV_step = 10000; desc->uV_step = 10000;
as3722_regs->desc[id].linear_min_sel = 1; desc->linear_min_sel = 1;
as3722_regs->desc[id].enable_time = 600; desc->enable_time = 600;
as3722_regs->desc[id].curr_table = as3722_sd016_current; desc->curr_table = as3722_sd016_current;
as3722_regs->desc[id].n_current_limits = desc->n_current_limits =
ARRAY_SIZE(as3722_sd016_current); ARRAY_SIZE(as3722_sd016_current);
if (id == AS3722_REGULATOR_ID_SD0) { if (id == AS3722_REGULATOR_ID_SD0) {
as3722_regs->desc[id].csel_reg = desc->csel_reg = AS3722_OVCURRENT_REG;
AS3722_OVCURRENT_REG; desc->csel_mask =
as3722_regs->desc[id].csel_mask =
AS3722_OVCURRENT_SD0_TRIP_MASK; AS3722_OVCURRENT_SD0_TRIP_MASK;
} else if (id == AS3722_REGULATOR_ID_SD1) { } else if (id == AS3722_REGULATOR_ID_SD1) {
as3722_regs->desc[id].csel_reg = desc->csel_reg = AS3722_OVCURRENT_REG;
AS3722_OVCURRENT_REG; desc->csel_mask =
as3722_regs->desc[id].csel_mask =
AS3722_OVCURRENT_SD1_TRIP_MASK; AS3722_OVCURRENT_SD1_TRIP_MASK;
} else if (id == AS3722_REGULATOR_ID_SD6) { } else if (id == AS3722_REGULATOR_ID_SD6) {
as3722_regs->desc[id].csel_reg = desc->csel_reg = AS3722_OVCURRENT_DEB_REG;
AS3722_OVCURRENT_DEB_REG; desc->csel_mask =
as3722_regs->desc[id].csel_mask =
AS3722_OVCURRENT_SD6_TRIP_MASK; AS3722_OVCURRENT_SD6_TRIP_MASK;
} }
break; break;
...@@ -801,9 +786,8 @@ static int as3722_regulator_probe(struct platform_device *pdev) ...@@ -801,9 +786,8 @@ static int as3722_regulator_probe(struct platform_device *pdev)
ops = &as3722_sd2345_extcntrl_ops; ops = &as3722_sd2345_extcntrl_ops;
else else
ops = &as3722_sd2345_ops; ops = &as3722_sd2345_ops;
as3722_regs->desc[id].linear_ranges = desc->linear_ranges = as3722_sd2345_ranges;
as3722_sd2345_ranges; desc->n_linear_ranges =
as3722_regs->desc[id].n_linear_ranges =
ARRAY_SIZE(as3722_sd2345_ranges); ARRAY_SIZE(as3722_sd2345_ranges);
break; break;
default: default:
...@@ -811,24 +795,19 @@ static int as3722_regulator_probe(struct platform_device *pdev) ...@@ -811,24 +795,19 @@ static int as3722_regulator_probe(struct platform_device *pdev)
ops = &as3722_ldo_extcntrl_ops; ops = &as3722_ldo_extcntrl_ops;
else else
ops = &as3722_ldo_ops; ops = &as3722_ldo_ops;
as3722_regs->desc[id].enable_time = 500; desc->enable_time = 500;
as3722_regs->desc[id].linear_ranges = as3722_ldo_ranges; desc->linear_ranges = as3722_ldo_ranges;
as3722_regs->desc[id].n_linear_ranges = desc->n_linear_ranges = ARRAY_SIZE(as3722_ldo_ranges);
ARRAY_SIZE(as3722_ldo_ranges); desc->curr_table = as3722_ldo_current;
as3722_regs->desc[id].curr_table = as3722_ldo_current; desc->n_current_limits = ARRAY_SIZE(as3722_ldo_current);
as3722_regs->desc[id].n_current_limits = desc->csel_reg = as3722_reg_lookup[id].vsel_reg;
ARRAY_SIZE(as3722_ldo_current); desc->csel_mask = AS3722_LDO_ILIMIT_MASK;
as3722_regs->desc[id].csel_reg =
as3722_reg_lookup[id].vsel_reg;
as3722_regs->desc[id].csel_mask =
AS3722_LDO_ILIMIT_MASK;
break; break;
} }
as3722_regs->desc[id].ops = ops; desc->ops = ops;
config.init_data = reg_config->reg_init; config.init_data = reg_config->reg_init;
config.of_node = as3722_regulator_matches[id].of_node; config.of_node = as3722_regulator_matches[id].of_node;
rdev = devm_regulator_register(&pdev->dev, rdev = devm_regulator_register(&pdev->dev, desc, &config);
&as3722_regs->desc[id], &config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
ret = PTR_ERR(rdev); ret = PTR_ERR(rdev);
dev_err(&pdev->dev, "regulator %d register failed %d\n", dev_err(&pdev->dev, "regulator %d register failed %d\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7