From: Maarten ter Huurne <maarten@treewalker.org>
To: Wenyou Yang <wenyou.yang@atmel.com>
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org,
Maarten ter Huurne <maarten@treewalker.org>
Subject: [PATCH 4/7] regulator: act8865: Rename platform_data field to init_data
Date: Sun, 28 Feb 2016 16:53:26 +0100 [thread overview]
Message-ID: <1456674809-16422-4-git-send-email-maarten@treewalker.org> (raw)
In-Reply-To: <1456674809-16422-1-git-send-email-maarten@treewalker.org>
Make the field name match its type.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
---
drivers/regulator/act8865-regulator.c | 4 ++--
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 477d60c..0d1b235 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -418,7 +418,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++;
}
@@ -445,7 +445,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 15fa8f2..2eb3860 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;
};
/**
--
2.6.2
next prev parent reply other threads:[~2016-02-28 15:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-28 15:53 [PATCH 1/7] regulator: act8865: Expose act8600 registers via debugfs Maarten ter Huurne
2016-02-28 15:53 ` [PATCH 2/7] regulator: act8865: Remove redundant dev lookups Maarten ter Huurne
2016-02-28 15:53 ` [PATCH 3/7] regulator: act8865: Remove "static" from local variable Maarten ter Huurne
2016-02-28 15:53 ` Maarten ter Huurne [this message]
2016-02-28 15:53 ` [PATCH 5/7] regulator: act8865: Pass of_node via act8865_regulator_data Maarten ter Huurne
2016-02-29 11:37 ` Mark Brown
2016-02-28 15:53 ` [PATCH 6/7] regulator: act8865: Specify fixed voltage of 3.3V for ACT8600's REG9 Maarten ter Huurne
2016-02-28 15:53 ` [PATCH 7/7] regulator: act8865: Init at subsys level Maarten ter Huurne
2016-02-29 11:35 ` Mark Brown
2016-03-17 14:17 ` Maarten ter Huurne
2016-02-29 11:28 ` [PATCH 1/7] regulator: act8865: Expose act8600 registers via debugfs Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456674809-16422-4-git-send-email-maarten@treewalker.org \
--to=maarten@treewalker.org \
--cc=Zubair.Kakakhel@imgtec.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=wenyou.yang@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome