Skip to content

Commit

Permalink
regulator: sy7636a: Use the parent driver data
Browse files Browse the repository at this point in the history
Use the parent's MFD data instead of our data.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
Link: https://lore.kernel.org/r/20210803084456.198-6-alistair@alistair23.me
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Alistair Francis authored and Mark Brown committed Aug 3, 2021
1 parent e5dad32 commit 4cafe1a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/regulator/sy7636a-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -76,28 +76,28 @@ 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);
}

sy7636a->pgood_gpio = gdp;

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);
}
Expand Down

0 comments on commit 4cafe1a

Please sign in to comment.