diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:33 -0500 |
| commit | eb230d4a6120673938dddd1e4fbbf3ff6def2976 (patch) | |
| tree | e3e6e7bf0c3ef552913d4f8ff54e6f2fc1902e8b | |
| parent | 52582adcb9c45b0d7b6decfb39325c303f06d8e0 (diff) | |
| parent | 5551a6a0eb1b329f85da58cfdf204a89efaa25a9 (diff) | |
Merge remote-tracking branch 'regulator/topic/da9055' into regulator-next
| -rw-r--r-- | drivers/regulator/da9055-regulator.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c index 1a05ac66878f..30221099d09c 100644 --- a/drivers/regulator/da9055-regulator.c +++ b/drivers/regulator/da9055-regulator.c | |||
| @@ -58,7 +58,6 @@ struct da9055_volt_reg { | |||
| 58 | int reg_b; | 58 | int reg_b; |
| 59 | int sl_shift; | 59 | int sl_shift; |
| 60 | int v_mask; | 60 | int v_mask; |
| 61 | int v_shift; | ||
| 62 | }; | 61 | }; |
| 63 | 62 | ||
| 64 | struct da9055_mode_reg { | 63 | struct da9055_mode_reg { |
| @@ -388,7 +387,6 @@ static struct regulator_ops da9055_ldo_ops = { | |||
| 388 | .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ | 387 | .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ |
| 389 | .sl_shift = 7,\ | 388 | .sl_shift = 7,\ |
| 390 | .v_mask = (1 << (vbits)) - 1,\ | 389 | .v_mask = (1 << (vbits)) - 1,\ |
| 391 | .v_shift = (vbits),\ | ||
| 392 | },\ | 390 | },\ |
| 393 | } | 391 | } |
| 394 | 392 | ||
| @@ -417,7 +415,6 @@ static struct regulator_ops da9055_ldo_ops = { | |||
| 417 | .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ | 415 | .reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \ |
| 418 | .sl_shift = 7,\ | 416 | .sl_shift = 7,\ |
| 419 | .v_mask = (1 << (vbits)) - 1,\ | 417 | .v_mask = (1 << (vbits)) - 1,\ |
| 420 | .v_shift = (vbits),\ | ||
| 421 | },\ | 418 | },\ |
| 422 | .mode = {\ | 419 | .mode = {\ |
| 423 | .reg = DA9055_REG_BCORE_MODE,\ | 420 | .reg = DA9055_REG_BCORE_MODE,\ |