|
@@ -28,8 +28,6 @@
|
|
|
#define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators)
|
|
|
|
|
|
struct s2mps11_info {
|
|
|
- struct regulator_dev *rdev[S2MPS11_REGULATOR_MAX];
|
|
|
-
|
|
|
int ramp_delay2;
|
|
|
int ramp_delay34;
|
|
|
int ramp_delay5;
|
|
@@ -439,6 +437,8 @@ common_reg:
|
|
|
config.regmap = iodev->regmap_pmic;
|
|
|
config.driver_data = s2mps11;
|
|
|
for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
|
|
|
+ struct regulator_dev *regulator;
|
|
|
+
|
|
|
if (!reg_np) {
|
|
|
config.init_data = pdata->regulators[i].initdata;
|
|
|
config.of_node = pdata->regulators[i].reg_node;
|
|
@@ -447,10 +447,10 @@ common_reg:
|
|
|
config.of_node = rdata[i].of_node;
|
|
|
}
|
|
|
|
|
|
- s2mps11->rdev[i] = devm_regulator_register(&pdev->dev,
|
|
|
+ regulator = devm_regulator_register(&pdev->dev,
|
|
|
®ulators[i], &config);
|
|
|
- if (IS_ERR(s2mps11->rdev[i])) {
|
|
|
- ret = PTR_ERR(s2mps11->rdev[i]);
|
|
|
+ if (IS_ERR(regulator)) {
|
|
|
+ ret = PTR_ERR(regulator);
|
|
|
dev_err(&pdev->dev, "regulator init failed for %d\n",
|
|
|
i);
|
|
|
return ret;
|