diff options
| author | Maarten ter Huurne <maarten@treewalker.org> | 2016-02-28 18:53:26 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-29 14:33:46 +0300 |
| commit | 30f065bf1f05b98ac6b5620c4ce6d0e865f9dc95 (patch) | |
| tree | 3bca74825791a3b67675c11fb4f4f0bf2edd169b | |
| parent | abea1bb08c1016d06bf21d1e5a56f10b31f0c60f (diff) | |
| download | linux-30f065bf1f05b98ac6b5620c4ce6d0e865f9dc95.tar.xz | |
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>
| -rw-r--r-- | drivers/regulator/act8865-regulator.c | 4 | ||||
| -rw-r--r-- | include/linux/regulator/act8865.h | 4 |
2 files changed, 4 insertions, 4 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; diff --git a/include/linux/regulator/act8865.h b/include/linux/regulator/act8865.h index 15fa8f2d35c9..2eb386017fa5 100644 --- a/include/linux/regulator/act8865.h +++ b/include/linux/regulator/act8865.h @@ -68,12 +68,12 @@ enum { * act8865_regulator_data - regulator data * @id: regulator id * @name: regulator name - * @platform_data: regulator init data + * @init_data: regulator init data */ struct act8865_regulator_data { int id; const char *name; - struct regulator_init_data *platform_data; + struct regulator_init_data *init_data; }; /** |