Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / drivers / regulator / wm8350-regulator.c

diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 05ecfb872319c605bb3166c547c7020c5f57c0e7..94e550dc70b64a6ef5042a68d2aa8dfef445bec2 100644 (file)
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -1269,7 +1269,7 @@ static struct regulator_ops wm8350_isink_ops = {
        .enable_time = wm8350_isink_enable_time,
 };
 
-static struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {
+static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {
        {
                .name = "DCDC1",
                .id = WM8350_DCDC_1,
@@ -1398,6 +1398,7 @@ static irqreturn_t pmic_uv_handler(int irq, void *data)
 static int wm8350_regulator_probe(struct platform_device *pdev)
 {
        struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
+       struct regulator_config config = { };
        struct regulator_dev *rdev;
        int ret;
        u16 val;
@@ -1425,10 +1426,12 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
                break;
        }
 
+       config.dev = &pdev->dev;
+       config.init_data = pdev->dev.platform_data;
+       config.driver_data = dev_get_drvdata(&pdev->dev);
+
        /* register regulator */
-       rdev = regulator_register(&wm8350_reg[pdev->id], &pdev->dev,
-                                 pdev->dev.platform_data,
-                                 dev_get_drvdata(&pdev->dev), NULL);
+       rdev = regulator_register(&wm8350_reg[pdev->id], &config);
        if (IS_ERR(rdev)) {
                dev_err(&pdev->dev, "failed to register %s\n",
                        wm8350_reg[pdev->id].name);