Applied "regulator: act8865: Rename platform_data field to init_data" to the regulator tree
Mark Brown
maintainerThe patch
regulator: act8865: Rename platform_data field to init_data
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
30f065bf1f05b98ac6b5620c4ce6d0e865f9dc95Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <[email protected]>
Date: Sun, 28 Feb 2016 16:53:26 +0100
Subject: [PATCH] regulator: act8865: Rename platform_data field to init_data
Make the field name match its type.
--- drivers/regulator/act8865-regulator.c | 4 ++-- include/linux/regulator/act8865.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/regulator/act8865-regulator.c +2 -2
@@ -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_datafor (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 ;
include/linux/regulator/act8865.h +2 -2
@@ -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; };/**
Signature · 1 line
2.7.0