Skip to content

Commit

Permalink
regulator: act8865: Rename platform_data field to init_data
Browse files Browse the repository at this point in the history
Make the field name match its type.

Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Maarten ter Huurne authored and Mark Brown committed Feb 29, 2016
1 parent abea1bb commit 30f065b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/regulator/act8865-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions include/linux/regulator/act8865.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/**
Expand Down

0 comments on commit 30f065b

Please sign in to comment.