Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / anatop-regulator.c

diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 0a3408570d0adda72f02286fe55bbb5b06c4afc3..3660bace123c97adc3f3ce4e1165216655578a3d 100644 (file)
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -120,6 +120,7 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
        struct anatop_regulator *sreg;
        struct regulator_init_data *initdata;
        struct anatop *anatopmfd = dev_get_drvdata(pdev->dev.parent);
+       struct regulator_config config = { };
        int ret = 0;
 
        initdata = of_get_regulator_init_data(dev, np);
@@ -176,9 +177,13 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
        rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage)
                / 25000 + 1;
 
+       config.dev = &pdev->dev;
+       config.init_data = initdata;
+       config.driver_data = sreg;
+       config.of_node = pdev->dev.of_node;
+
        /* register regulator */
-       rdev = regulator_register(rdesc, dev,
-                                 initdata, sreg, pdev->dev.of_node);
+       rdev = regulator_register(rdesc, &config);
        if (IS_ERR(rdev)) {
                dev_err(dev, "failed to register %s\n",
                        rdesc->name);