summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenyou Yang <wenyou.yang@atmel.com>2013-12-31 09:27:52 +0800
committerMark Brown <broonie@linaro.org>2013-12-31 13:05:55 +0000
commitd04b755273683ed31043563b8a3a2716bd8aa6a9 (patch)
treef00b5e4c5b44d83a86e2d1981fcef46154e91984
parentf1de2c2f2749ba42b87a49ae57deb346301dec02 (diff)
downloadlinux-d04b755273683ed31043563b8a3a2716bd8aa6a9.tar.bz2
regulator: act8865: register all regulators regardless of how many are used
As Mark pointed out, the driver should register all regulators regardless of how many are used in the system in order to aid diagnostics. But in the previous patch, only register the regulators that are used. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/regulator/act8865-regulator.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index f816ad866a43..5e3e1d270328 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -225,8 +225,8 @@ static int act8865_pdata_from_dt(struct device *dev,
return matched;
pdata->regulators = devm_kzalloc(dev,
- sizeof(struct act8865_regulator_data) * matched,
- GFP_KERNEL);
+ sizeof(struct act8865_regulator_data) *
+ ARRAY_SIZE(act8865_matches), GFP_KERNEL);
if (!pdata->regulators) {
dev_err(dev, "%s: failed to allocate act8865 registor\n",
__func__);
@@ -236,10 +236,7 @@ static int act8865_pdata_from_dt(struct device *dev,
pdata->num_regulators = matched;
regulator = pdata->regulators;
- for (i = 0; i < matched; i++) {
- if (!act8865_matches[i].init_data)
- continue;
-
+ for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) {
regulator->id = i;
regulator->name = act8865_matches[i].name;
regulator->platform_data = act8865_matches[i].init_data;
@@ -306,7 +303,7 @@ static int act8865_pmic_probe(struct i2c_client *client,
}
/* Finally register devices */
- for (i = 0; i < pdata->num_regulators; i++) {
+ for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) {
id = pdata->regulators[i].id;