Merge remote-tracking branch 'regulator/topic/max8925' into regulator-next

diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index 0d5f64a805a039561390b975dbfb72551cc4f5d1..3597da8f0dca6341720be5b40b4459682cc74f50 100644 (file)
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -246,7 +246,6 @@ static struct max8925_regulator_info max8925_regulator_info[] = {
 
 #ifdef CONFIG_OF
 static int max8925_regulator_dt_init(struct platform_device *pdev,
-                                   struct max8925_regulator_info *info,
                                    struct regulator_config *config,
                                    int ridx)
 {
@@ -272,7 +271,7 @@ static int max8925_regulator_dt_init(struct platform_device *pdev,
        return 0;
 }
 #else
-#define max8925_regulator_dt_init(w, x, y, z)  (-1)
+#define max8925_regulator_dt_init(x, y, z)     (-1)
 #endif
 
 static int max8925_regulator_probe(struct platform_device *pdev)
@@ -309,7 +308,7 @@ static int max8925_regulator_probe(struct platform_device *pdev)
        config.dev = &pdev->dev;
        config.driver_data = ri;
 
-       if (max8925_regulator_dt_init(pdev, ri, &config, regulator_idx))
+       if (max8925_regulator_dt_init(pdev, &config, regulator_idx))
                if (pdata)
                        config.init_data = pdata;