regulator: sy7636a: Use the regmap directly
authorAlistair Francis <alistair@alistair23.me>
Fri, 6 Aug 2021 09:10:51 +0000 (19:10 +1000)
committerMark Brown <broonie@kernel.org>
Mon, 9 Aug 2021 11:40:26 +0000 (12:40 +0100)
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Link: https://lore.kernel.org/r/20210806091058.141-6-alistair@alistair23.me
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/sy7636a-regulator.c

index 37bf2a3..8360b39 100644 (file)
@@ -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)) {