diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:13 +0100 |
| commit | 882e3dba4c486a4953ccf380faf2a9751c45c018 (patch) | |
| tree | 6b772936459e44f3ef6b1ff5a0f0fb9bcf8b81ed /drivers/regulator | |
| parent | bca3523b2283ac6e81e37d56ddebef1786ac6557 (diff) | |
| parent | 37a6f43dd1924013cbf2eb91b74b3cc9818b3af8 (diff) | |
| download | blackbird-op-linux-882e3dba4c486a4953ccf380faf2a9751c45c018.tar.gz blackbird-op-linux-882e3dba4c486a4953ccf380faf2a9751c45c018.zip | |
Merge remote-tracking branch 'regulator/topic/lp872x' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/lp872x.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c index b16336bcd4d4..1018fb2020a9 100644 --- a/drivers/regulator/lp872x.c +++ b/drivers/regulator/lp872x.c @@ -373,7 +373,7 @@ static int lp8725_buck_set_current_limit(struct regulator_dev *rdev, return -EINVAL; } - for (i = ARRAY_SIZE(lp8725_buck_uA) - 1 ; i >= 0; i--) { + for (i = ARRAY_SIZE(lp8725_buck_uA) - 1; i >= 0; i--) { if (lp8725_buck_uA[i] >= min_uA && lp8725_buck_uA[i] <= max_uA) return lp872x_update_bits(lp, addr, @@ -787,7 +787,7 @@ static int lp872x_regulator_register(struct lp872x *lp) struct regulator_dev *rdev; int i, ret; - for (i = 0 ; i < lp->num_regulators ; i++) { + for (i = 0; i < lp->num_regulators; i++) { desc = (lp->chipid == LP8720) ? &lp8720_regulator_desc[i] : &lp8725_regulator_desc[i]; @@ -820,7 +820,7 @@ static void lp872x_regulator_unregister(struct lp872x *lp) struct regulator_dev *rdev; int i; - for (i = 0 ; i < lp->num_regulators ; i++) { + for (i = 0; i < lp->num_regulators; i++) { rdev = *(lp->regulators + i); regulator_unregister(rdev); } @@ -907,7 +907,8 @@ static struct lp872x_platform_data goto out; for (i = 0; i < num_matches; i++) { - pdata->regulator_data[i].id = (int)match[i].driver_data; + pdata->regulator_data[i].id = + (enum lp872x_regulator_id)match[i].driver_data; pdata->regulator_data[i].init_data = match[i].init_data; /* Operation mode configuration for buck/buck1/buck2 */ |
