Skip to content

L
linux
Commit eb230d4a authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'regulator/topic/da9055' into regulator-next

parents 52582adc 5551a6a0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
drivers/regulator/da9055-regulator.c
View file @ eb230d4a
...@@ -58,7 +58,6 @@ struct da9055_volt_reg { ...@@ -58,7 +58,6 @@ struct da9055_volt_reg {
int reg_b; int reg_b;
int sl_shift; int sl_shift;
int v_mask; int v_mask;
int v_shift;
}; };
struct da9055_mode_reg { struct da9055_mode_reg {
...@@ -388,7 +387,6 @@ static struct regulator_ops da9055_ldo_ops = { ...@@ -388,7 +387,6 @@ static struct regulator_ops da9055_ldo_ops = {
.reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \
.sl_shift = 7,\ .sl_shift = 7,\
.v_mask = (1 << (vbits)) - 1,\ .v_mask = (1 << (vbits)) - 1,\
.v_shift = (vbits),\
},\ },\
} }
...@@ -417,7 +415,6 @@ static struct regulator_ops da9055_ldo_ops = { ...@@ -417,7 +415,6 @@ static struct regulator_ops da9055_ldo_ops = {
.reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \
.sl_shift = 7,\ .sl_shift = 7,\
.v_mask = (1 << (vbits)) - 1,\ .v_mask = (1 << (vbits)) - 1,\
.v_shift = (vbits),\
},\ },\
.mode = {\ .mode = {\
.reg = DA9055_REG_BCORE_MODE,\ .reg = DA9055_REG_BCORE_MODE,\
......
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