LKML Archive on lore.kernel.org
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 v8 06/11] regulator: sy7636a: Use the parent driver data
Date: Tue,  3 Aug 2021 18:44:53 +1000	[thread overview]
Message-ID: <20210803084456.198-6-alistair@alistair23.me> (raw)
In-Reply-To: <20210803084456.198-1-alistair@alistair23.me>

Use the parent's MFD data instead of our data.

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

diff --git a/drivers/regulator/sy7636a-regulator.c b/drivers/regulator/sy7636a-regulator.c
index c3b34cac8c7f..0bd21c3ea24a 100644
--- a/drivers/regulator/sy7636a-regulator.c
+++ b/drivers/regulator/sy7636a-regulator.c
@@ -33,7 +33,7 @@ static int sy7636a_get_vcom_voltage_op(struct regulator_dev *rdev)
 
 static int sy7636a_get_status(struct regulator_dev *rdev)
 {
-	struct sy7636a *sy7636a = rdev_get_drvdata(rdev);
+	struct sy7636a *sy7636a = dev_get_drvdata(rdev->dev.parent);
 	int ret = 0;
 
 	ret = gpiod_get_value_cansleep(sy7636a->pgood_gpio);
@@ -76,9 +76,9 @@ static int sy7636a_regulator_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, sy7636a);
 
-	gdp = devm_gpiod_get(sy7636a->dev, "epd-pwr-good", GPIOD_IN);
+	gdp = devm_gpiod_get(pdev->dev.parent, "epd-pwr-good", GPIOD_IN);
 	if (IS_ERR(gdp)) {
-		dev_err(sy7636a->dev, "Power good GPIO fault %ld\n", PTR_ERR(gdp));
+		dev_err(pdev->dev.parent, "Power good GPIO fault %ld\n", PTR_ERR(gdp));
 		return PTR_ERR(gdp);
 	}
 
@@ -86,18 +86,18 @@ static int sy7636a_regulator_probe(struct platform_device *pdev)
 
 	ret = regmap_write(sy7636a->regmap, SY7636A_REG_POWER_ON_DELAY_TIME, 0x0);
 	if (ret) {
-		dev_err(sy7636a->dev, "Failed to initialize regulator: %d\n", ret);
+		dev_err(pdev->dev.parent, "Failed to initialize regulator: %d\n", ret);
 		return ret;
 	}
 
 	config.dev = &pdev->dev;
-	config.dev->of_node = sy7636a->dev->of_node;
+	config.dev->of_node = pdev->dev.parent->of_node;
 	config.driver_data = sy7636a;
 	config.regmap = sy7636a->regmap;
 
 	rdev = devm_regulator_register(&pdev->dev, &desc, &config);
 	if (IS_ERR(rdev)) {
-		dev_err(sy7636a->dev, "Failed to register %s regulator\n",
+		dev_err(pdev->dev.parent, "Failed to register %s regulator\n",
 			pdev->name);
 		return PTR_ERR(rdev);
 	}
-- 
2.31.1


  parent reply	other threads:[~2021-08-03  8:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-03  8:44 [PATCH v8 01/11] dt-bindings: mfd: Initial commit of silergy,sy7636a.yaml Alistair Francis
2021-08-03  8:44 ` [PATCH v8 02/11] mfd: sy7636a: Initial commit Alistair Francis
2021-08-03 13:16   ` Lee Jones
2021-08-04  8:22     ` Alistair Francis
2021-08-04  9:06       ` Lee Jones
2021-08-04  9:37         ` Alistair Francis
2021-08-04 10:28           ` Lee Jones
2021-08-04 10:35             ` Alistair Francis
2021-08-03  8:44 ` [PATCH v8 03/11] thermal: sy7636a: Add thermal driver for sy7636a Alistair Francis
2021-08-03  8:44 ` [PATCH v8 04/11] hwmon: sy7636a: Add temperature " Alistair Francis
2021-08-03  8:44 ` [PATCH v8 05/11] regulator: sy7636a: Remove the poll_enable_time Alistair Francis
2021-08-03  8:44 ` Alistair Francis [this message]
2021-08-03  8:44 ` [PATCH v8 07/11] regulator: sy7636a: Store the epd-pwr-good GPIO locally Alistair Francis
2021-08-03  8:44 ` [PATCH v8 08/11] ARM: imx_v6_v7_defconfig: Enable silergy,sy7636a Alistair Francis
2021-08-03  8:44 ` [PATCH v8 09/11] ARM: dts: imx7d: remarkable2: " Alistair Francis
2021-08-04 12:43   ` Lee Jones
2021-08-05  8:05     ` Alistair Francis
2021-08-05  8:26       ` Lee Jones
2021-08-05  8:37         ` Alistair Francis
2021-08-03 22:35 ` (subset) [PATCH v8 01/11] dt-bindings: mfd: Initial commit of silergy,sy7636a.yaml 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=20210803084456.198-6-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 \
    --subject='Re: [PATCH v8 06/11] regulator: sy7636a: Use the parent driver data' \
    /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

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).