From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>, mgr@pengutronix.de
Subject: [PATCH 06/10] mfd: stpmic1: use dev_get_regmap instead of priv member
Date: Wed, 6 Nov 2019 08:11:51 +0100 [thread overview]
Message-ID: <20191106071155.26389-6-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20191106071155.26389-1-a.fatoum@pengutronix.de>
When we call regmap_init, the regmap is associated with the device
supplied and can be queried with dev_get_regmap. This is more natural
than expecting cell drivers to cast dev->parent->priv. Do it.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/mfd/stpmic1.c | 1 -
drivers/watchdog/stpmic1_wdt.c | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c
index 88c7921990fc..eae6fe3a4e05 100644
--- a/drivers/mfd/stpmic1.c
+++ b/drivers/mfd/stpmic1.c
@@ -69,7 +69,6 @@ static int __init stpmic1_probe(struct device_d *dev)
stpmic1->client = to_i2c_client(dev);
regmap = regmap_init(dev, ®map_stpmic1_i2c_bus,
stpmic1, &stpmic1_regmap_i2c_config);
- dev->priv = regmap;
ret = regmap_register_cdev(regmap, NULL);
if (ret)
diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c
index f79b7e8c2768..9b7a586387db 100644
--- a/drivers/watchdog/stpmic1_wdt.c
+++ b/drivers/watchdog/stpmic1_wdt.c
@@ -169,7 +169,10 @@ static int stpmic1_wdt_probe(struct device_d *dev)
int ret;
wdt = xzalloc(sizeof(*wdt));
- wdt->regmap = dev->parent->priv;
+
+ wdt->regmap = dev_get_regmap(dev->parent, NULL);
+ if (IS_ERR(wdt->regmap))
+ return PTR_ERR(wdt->regmap);
wdd = &wdt->wdd;
wdd->hwdev = dev;
--
2.24.0.rc1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-11-06 7:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 7:11 [PATCH 01/10] commands: regulator: move implementation to regulator core Ahmad Fatoum
2019-11-06 7:11 ` [PATCH 02/10] commands: regulator: add support for enabling/disabling regulators Ahmad Fatoum
2019-11-06 9:44 ` Sascha Hauer
2019-11-06 7:11 ` [PATCH 03/10] regulator: copy upstream struct regulator_desc documentation Ahmad Fatoum
2019-11-06 10:24 ` Sascha Hauer
2019-11-06 7:11 ` [PATCH 04/10] regulator: port Linux of_regulator_match Ahmad Fatoum
2019-11-06 7:11 ` [PATCH 05/10] regulator: import linear voltage range helpers Ahmad Fatoum
2019-11-06 7:11 ` Ahmad Fatoum [this message]
2019-11-06 7:11 ` [PATCH 07/10] regulator: add driver for stpmic1-regulators Ahmad Fatoum
2019-11-06 7:29 ` [PATCH 11/10] fixup! " Ahmad Fatoum
2019-11-06 7:11 ` [PATCH 08/10] ARM: dts: stm32mp157a-dk1: remove unnecessary sram node Ahmad Fatoum
2019-11-06 7:11 ` [PATCH 09/10] ARM: stm32mp: enable STPMIC1 MFD and cell drivers Ahmad Fatoum
2019-11-06 7:11 ` [PATCH 10/10] Revert "ARM: dts: stm32mp157a-dk1: overwrite regulator for sdmmc node" Ahmad Fatoum
2019-11-06 9:39 ` [PATCH 01/10] commands: regulator: move implementation to regulator core Sascha Hauer
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=20191106071155.26389-6-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=mgr@pengutronix.de \
/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