* [PATCH] regulator: pbias: Use of_device_get_match_data
@ 2019-09-25 10:12 Axel Lin
2019-10-01 11:40 ` Applied "regulator: pbias: Use of_device_get_match_data" to the regulator tree Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2019-09-25 10:12 UTC (permalink / raw)
To: Mark Brown
Cc: Balaji T K, Ravikumar Kattekola, Liam Girdwood, linux-kernel, Axel Lin
Use of_device_get_match_data to simplify the code a bit.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/pbias-regulator.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/pbias-regulator.c b/drivers/regulator/pbias-regulator.c
index 92b41a6a4dc2..a59811060bdc 100644
--- a/drivers/regulator/pbias-regulator.c
+++ b/drivers/regulator/pbias-regulator.c
@@ -164,7 +164,6 @@ static int pbias_regulator_probe(struct platform_device *pdev)
const struct pbias_reg_info *info;
int ret = 0;
int count, idx, data_idx = 0;
- const struct of_device_id *match;
const struct pbias_of_data *data;
unsigned int offset;
@@ -183,9 +182,8 @@ static int pbias_regulator_probe(struct platform_device *pdev)
if (IS_ERR(syscon))
return PTR_ERR(syscon);
- match = of_match_device(of_match_ptr(pbias_of_match), &pdev->dev);
- if (match && match->data) {
- data = match->data;
+ data = of_device_get_match_data(&pdev->dev);
+ if (data) {
offset = data->offset;
} else {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Applied "regulator: pbias: Use of_device_get_match_data" to the regulator tree
2019-09-25 10:12 [PATCH] regulator: pbias: Use of_device_get_match_data Axel Lin
@ 2019-10-01 11:40 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2019-10-01 11:40 UTC (permalink / raw)
To: Axel Lin
Cc: Balaji T K, Liam Girdwood, linux-kernel, Mark Brown, Ravikumar Kattekola
The patch
regulator: pbias: Use of_device_get_match_data
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.5
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
From 41145b980e3f4c7c26763fae0379f1cb8f336868 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 25 Sep 2019 18:12:56 +0800
Subject: [PATCH] regulator: pbias: Use of_device_get_match_data
Use of_device_get_match_data to simplify the code a bit.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20190925101256.19030-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/regulator/pbias-regulator.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/pbias-regulator.c b/drivers/regulator/pbias-regulator.c
index 92b41a6a4dc2..a59811060bdc 100644
--- a/drivers/regulator/pbias-regulator.c
+++ b/drivers/regulator/pbias-regulator.c
@@ -164,7 +164,6 @@ static int pbias_regulator_probe(struct platform_device *pdev)
const struct pbias_reg_info *info;
int ret = 0;
int count, idx, data_idx = 0;
- const struct of_device_id *match;
const struct pbias_of_data *data;
unsigned int offset;
@@ -183,9 +182,8 @@ static int pbias_regulator_probe(struct platform_device *pdev)
if (IS_ERR(syscon))
return PTR_ERR(syscon);
- match = of_match_device(of_match_ptr(pbias_of_match), &pdev->dev);
- if (match && match->data) {
- data = match->data;
+ data = of_device_get_match_data(&pdev->dev);
+ if (data) {
offset = data->offset;
} else {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-01 11:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-25 10:12 [PATCH] regulator: pbias: Use of_device_get_match_data Axel Lin
2019-10-01 11:40 ` Applied "regulator: pbias: Use of_device_get_match_data" to the regulator tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).