Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona...

[mirror_ubuntu-bionic-kernel.git] / drivers / regulator / s2mpa01.c

diff --git a/drivers/regulator/s2mpa01.c b/drivers/regulator/s2mpa01.c
index 92f88753bfed274fa5acbec2d2e37dda22c43380..48f0ca90743cca5cec830e6b2ce74fa9f7e8d0a8 100644 (file)
--- a/drivers/regulator/s2mpa01.c
+++ b/drivers/regulator/s2mpa01.c
@@ -26,6 +26,7 @@
 #define S2MPA01_REGULATOR_CNT ARRAY_SIZE(regulators)
 
 struct s2mpa01_info {
+       struct of_regulator_match rdata[S2MPA01_REGULATOR_MAX];
        int ramp_delay24;
        int ramp_delay3;
        int ramp_delay5;
@@ -212,7 +213,7 @@ ramp_disable:
                                  1 << enable_shift, 0);
 }
 
-static struct regulator_ops s2mpa01_ldo_ops = {
+static const struct regulator_ops s2mpa01_ldo_ops = {
        .list_voltage           = regulator_list_voltage_linear,
        .map_voltage            = regulator_map_voltage_linear,
        .is_enabled             = regulator_is_enabled_regmap,
@@ -223,7 +224,7 @@ static struct regulator_ops s2mpa01_ldo_ops = {
        .set_voltage_time_sel   = regulator_set_voltage_time_sel,
 };
 
-static struct regulator_ops s2mpa01_buck_ops = {
+static const struct regulator_ops s2mpa01_buck_ops = {
        .list_voltage           = regulator_list_voltage_linear,
        .map_voltage            = regulator_map_voltage_linear,
        .is_enabled             = regulator_is_enabled_regmap,
@@ -341,9 +342,9 @@ static int s2mpa01_pmic_probe(struct platform_device *pdev)
 {
        struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
        struct sec_platform_data *pdata = dev_get_platdata(iodev->dev);
-       struct of_regulator_match rdata[S2MPA01_REGULATOR_MAX] = { };
        struct device_node *reg_np = NULL;
        struct regulator_config config = { };
+       struct of_regulator_match *rdata;
        struct s2mpa01_info *s2mpa01;
        int i;
 
@@ -351,17 +352,18 @@ static int s2mpa01_pmic_probe(struct platform_device *pdev)
        if (!s2mpa01)
                return -ENOMEM;
 
+       rdata = s2mpa01->rdata;
        for (i = 0; i < S2MPA01_REGULATOR_CNT; i++)
                rdata[i].name = regulators[i].name;
 
        if (iodev->dev->of_node) {
                reg_np = of_get_child_by_name(iodev->dev->of_node,
                                                        "regulators");
-                       if (!reg_np) {
-                               dev_err(&pdev->dev,
-                                       "could not find regulators sub-node\n");
-                               return -EINVAL;
-                       }
+               if (!reg_np) {
+                       dev_err(&pdev->dev,
+                               "could not find regulators sub-node\n");
+                       return -EINVAL;
+               }
 
                of_regulator_match(&pdev->dev, reg_np, rdata,
                                                S2MPA01_REGULATOR_MAX);