Commit 04d1446b authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

regulator: axp20x: Use rdev_get_id at appropriate places

Use rdev_get_id() to simplify the code a bit.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 969697de
...@@ -367,16 +367,14 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = { ...@@ -367,16 +367,14 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = {
static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp) static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
{ {
struct axp20x_dev *axp20x = rdev_get_drvdata(rdev); struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
const struct regulator_desc *desc; int id = rdev_get_id(rdev);
u8 reg, mask, enable, cfg = 0xff; u8 reg, mask, enable, cfg = 0xff;
const int *slew_rates; const int *slew_rates;
int rate_count = 0; int rate_count = 0;
desc = rdev->desc;
switch (axp20x->variant) { switch (axp20x->variant) {
case AXP209_ID: case AXP209_ID:
if (desc->id == AXP20X_DCDC2) { if (id == AXP20X_DCDC2) {
slew_rates = axp209_dcdc2_ldo3_slew_rates; slew_rates = axp209_dcdc2_ldo3_slew_rates;
rate_count = ARRAY_SIZE(axp209_dcdc2_ldo3_slew_rates); rate_count = ARRAY_SIZE(axp209_dcdc2_ldo3_slew_rates);
reg = AXP20X_DCDC2_LDO3_V_RAMP; reg = AXP20X_DCDC2_LDO3_V_RAMP;
...@@ -388,7 +386,7 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp) ...@@ -388,7 +386,7 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
break; break;
} }
if (desc->id == AXP20X_LDO3) { if (id == AXP20X_LDO3) {
slew_rates = axp209_dcdc2_ldo3_slew_rates; slew_rates = axp209_dcdc2_ldo3_slew_rates;
rate_count = ARRAY_SIZE(axp209_dcdc2_ldo3_slew_rates); rate_count = ARRAY_SIZE(axp209_dcdc2_ldo3_slew_rates);
reg = AXP20X_DCDC2_LDO3_V_RAMP; reg = AXP20X_DCDC2_LDO3_V_RAMP;
...@@ -435,13 +433,11 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp) ...@@ -435,13 +433,11 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev) static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev)
{ {
struct axp20x_dev *axp20x = rdev_get_drvdata(rdev); struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
const struct regulator_desc *desc; int id = rdev_get_id(rdev);
desc = rdev->desc;
switch (axp20x->variant) { switch (axp20x->variant) {
case AXP209_ID: case AXP209_ID:
if ((desc->id == AXP20X_LDO3) && if ((id == AXP20X_LDO3) &&
rdev->constraints && rdev->constraints->soft_start) { rdev->constraints && rdev->constraints->soft_start) {
int v_out; int v_out;
int ret; int ret;
......
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