regulator: s5m8767: Covert to devm_regulator_register()
Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Sangbeom Kim <sbkim73@samsung.com>hifive-unleashed-5.1
parent
b707a27445
commit
f0db475dee
|
@ -910,33 +910,16 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
|
||||||
config.regmap = iodev->regmap;
|
config.regmap = iodev->regmap;
|
||||||
config.of_node = pdata->regulators[i].reg_node;
|
config.of_node = pdata->regulators[i].reg_node;
|
||||||
|
|
||||||
rdev[i] = regulator_register(®ulators[id], &config);
|
rdev[i] = devm_regulator_register(&pdev->dev, ®ulators[id],
|
||||||
|
&config);
|
||||||
if (IS_ERR(rdev[i])) {
|
if (IS_ERR(rdev[i])) {
|
||||||
ret = PTR_ERR(rdev[i]);
|
ret = PTR_ERR(rdev[i]);
|
||||||
dev_err(s5m8767->dev, "regulator init failed for %d\n",
|
dev_err(s5m8767->dev, "regulator init failed for %d\n",
|
||||||
id);
|
id);
|
||||||
rdev[i] = NULL;
|
return ret;
|
||||||
goto err;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
err:
|
|
||||||
for (i = 0; i < s5m8767->num_regulators; i++)
|
|
||||||
regulator_unregister(rdev[i]);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int s5m8767_pmic_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct s5m8767_info *s5m8767 = platform_get_drvdata(pdev);
|
|
||||||
struct regulator_dev **rdev = s5m8767->rdev;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < s5m8767->num_regulators; i++)
|
|
||||||
regulator_unregister(rdev[i]);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -952,7 +935,6 @@ static struct platform_driver s5m8767_pmic_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.probe = s5m8767_pmic_probe,
|
.probe = s5m8767_pmic_probe,
|
||||||
.remove = s5m8767_pmic_remove,
|
|
||||||
.id_table = s5m8767_pmic_id,
|
.id_table = s5m8767_pmic_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue