summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2016-02-28 16:53:26 +0100
committerMark Brown <broonie@kernel.org>2016-02-29 20:33:46 +0900
commit30f065bf1f05b98ac6b5620c4ce6d0e865f9dc95 (patch)
tree3bca74825791a3b67675c11fb4f4f0bf2edd169b /drivers/regulator
parentabea1bb08c1016d06bf21d1e5a56f10b31f0c60f (diff)
regulator: act8865: Rename platform_data field to init_data
Make the field name match its type. Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/act8865-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index 984c30fa9516..1994795407c5 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -369,7 +369,7 @@ static int act8865_pdata_from_dt(struct device *dev,
for (i = 0; i < num_matches; i++) {
regulator->id = i;
regulator->name = matches[i].name;
- regulator->platform_data = matches[i].init_data;
+ regulator->init_data = matches[i].init_data;
of_node[i] = matches[i].of_node;
regulator++;
}
@@ -396,7 +396,7 @@ static struct regulator_init_data
for (i = 0; i < pdata->num_regulators; i++) {
if (pdata->regulators[i].id == id)
- return pdata->regulators[i].platform_data;
+ return pdata->regulators[i].init_data;
}
return NULL;