linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alistair Francis <alistair@alistair23.me>
To: lee.jones@linaro.org, robh+dt@kernel.org, lgirdwood@gmail.com,
	broonie@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	alistair23@gmail.com, Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v10 04/11] regulator: sy7636a: Use the regmap directly
Date: Sat,  7 Aug 2021 20:39:33 +1000	[thread overview]
Message-ID: <20210807103940.152-5-alistair@alistair23.me> (raw)
In-Reply-To: <20210807103940.152-1-alistair@alistair23.me>

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 drivers/regulator/sy7636a-regulator.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/regulator/sy7636a-regulator.c b/drivers/regulator/sy7636a-regulator.c
index 37bf2a3c06b7..8360b3947ead 100644
--- a/drivers/regulator/sy7636a-regulator.c
+++ b/drivers/regulator/sy7636a-regulator.c
@@ -14,7 +14,7 @@
 #include <linux/mfd/sy7636a.h>
 
 struct sy7636a_data {
-	struct sy7636a *sy7636a;
+	struct regmap *regmap;
 	struct gpio_desc *pgood_gpio;
 };
 
@@ -70,14 +70,14 @@ static const struct regulator_desc desc = {
 
 static int sy7636a_regulator_probe(struct platform_device *pdev)
 {
-	struct sy7636a *sy7636a = dev_get_drvdata(pdev->dev.parent);
+	struct regmap *regmap = dev_get_drvdata(pdev->dev.parent);
 	struct regulator_config config = { };
 	struct regulator_dev *rdev;
 	struct gpio_desc *gdp;
 	struct sy7636a_data *data;
 	int ret;
 
-	if (!sy7636a)
+	if (!regmap)
 		return -EPROBE_DEFER;
 
 	gdp = devm_gpiod_get(pdev->dev.parent, "epd-pwr-good", GPIOD_IN);
@@ -90,12 +90,12 @@ static int sy7636a_regulator_probe(struct platform_device *pdev)
 	if (!data)
 		return -ENOMEM;
 
-	data->sy7636a = sy7636a;
+	data->regmap = regmap;
 	data->pgood_gpio = gdp;
 
 	platform_set_drvdata(pdev, data);
 
-	ret = regmap_write(sy7636a->regmap, SY7636A_REG_POWER_ON_DELAY_TIME, 0x0);
+	ret = regmap_write(regmap, SY7636A_REG_POWER_ON_DELAY_TIME, 0x0);
 	if (ret) {
 		dev_err(pdev->dev.parent, "Failed to initialize regulator: %d\n", ret);
 		return ret;
@@ -103,8 +103,7 @@ static int sy7636a_regulator_probe(struct platform_device *pdev)
 
 	config.dev = &pdev->dev;
 	config.dev->of_node = pdev->dev.parent->of_node;
-	config.driver_data = sy7636a;
-	config.regmap = sy7636a->regmap;
+	config.regmap = regmap;
 
 	rdev = devm_regulator_register(&pdev->dev, &desc, &config);
 	if (IS_ERR(rdev)) {
-- 
2.31.1


  parent reply	other threads:[~2021-08-07 10:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-07 10:39 [PATCH v10 00/11] Add support for the silergy,sy7636a Alistair Francis
2021-08-07 10:39 ` [PATCH v10 01/11] dt-bindings: mfd: Initial commit of silergy,sy7636a.yaml Alistair Francis
2021-08-13 20:39   ` Rob Herring
2021-08-07 10:39 ` [PATCH v10 02/11] mfd: simple-mfd-i2c: Add a Kconfig name Alistair Francis
2021-08-10  7:53   ` Lee Jones
2021-08-15 11:55     ` Alistair Francis
2021-08-07 10:39 ` [PATCH v10 03/11] mfd: simple-mfd-i2c: Enable support for the silergy,sy7636a Alistair Francis
2021-08-07 10:39 ` Alistair Francis [this message]
2021-08-07 10:39 ` [PATCH v10 05/11] regulator: sy7636a: Remove requirement on sy7636a mfd Alistair Francis
2021-08-07 10:39 ` [PATCH v10 06/11] thermal: sy7636a: Add thermal driver for sy7636a Alistair Francis
2021-08-07 10:39 ` [PATCH v10 07/11] hwmon: sy7636a: Add temperature " Alistair Francis
2021-08-07 10:39 ` [PATCH v10 08/11] ARM: imx_v6_v7_defconfig: Enable silergy,sy7636a Alistair Francis
2021-08-07 10:39 ` [PATCH v10 09/11] ARM: dts: imx7d: remarkable2: " Alistair Francis
2021-08-07 10:39 ` [PATCH v10 10/11] ARM: imx_v6_v7_defconfig: Enable backlight class devices Alistair Francis
2021-08-07 10:39 ` [PATCH v10 11/11] ARM: dts: imx7d: remarkable2: Enable lcdif Alistair Francis

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=20210807103940.152-5-alistair@alistair23.me \
    --to=alistair@alistair23.me \
    --cc=alistair23@gmail.com \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=kernel@pengutronix.de \
    --cc=lee.jones@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).