regulator: gpio: Convert to devm_regulator_register
Use devm_regulator_register to simplify the code. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
178d08ea81
commit
7cdc2ee7bf
|
@ -36,7 +36,6 @@
|
||||||
|
|
||||||
struct gpio_regulator_data {
|
struct gpio_regulator_data {
|
||||||
struct regulator_desc desc;
|
struct regulator_desc desc;
|
||||||
struct regulator_dev *dev;
|
|
||||||
|
|
||||||
struct gpio_desc **gpiods;
|
struct gpio_desc **gpiods;
|
||||||
int nr_gpios;
|
int nr_gpios;
|
||||||
|
@ -233,6 +232,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
|
||||||
struct device_node *np = dev->of_node;
|
struct device_node *np = dev->of_node;
|
||||||
struct gpio_regulator_data *drvdata;
|
struct gpio_regulator_data *drvdata;
|
||||||
struct regulator_config cfg = { };
|
struct regulator_config cfg = { };
|
||||||
|
struct regulator_dev *rdev;
|
||||||
enum gpiod_flags gflags;
|
enum gpiod_flags gflags;
|
||||||
int ptr, ret, state, i;
|
int ptr, ret, state, i;
|
||||||
|
|
||||||
|
@ -326,9 +326,9 @@ static int gpio_regulator_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(cfg.ena_gpiod))
|
if (IS_ERR(cfg.ena_gpiod))
|
||||||
return PTR_ERR(cfg.ena_gpiod);
|
return PTR_ERR(cfg.ena_gpiod);
|
||||||
|
|
||||||
drvdata->dev = regulator_register(&drvdata->desc, &cfg);
|
rdev = devm_regulator_register(dev, &drvdata->desc, &cfg);
|
||||||
if (IS_ERR(drvdata->dev)) {
|
if (IS_ERR(rdev)) {
|
||||||
ret = PTR_ERR(drvdata->dev);
|
ret = PTR_ERR(rdev);
|
||||||
dev_err(dev, "Failed to register regulator: %d\n", ret);
|
dev_err(dev, "Failed to register regulator: %d\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -338,15 +338,6 @@ static int gpio_regulator_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int gpio_regulator_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
regulator_unregister(drvdata->dev);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(CONFIG_OF)
|
#if defined(CONFIG_OF)
|
||||||
static const struct of_device_id regulator_gpio_of_match[] = {
|
static const struct of_device_id regulator_gpio_of_match[] = {
|
||||||
{ .compatible = "regulator-gpio", },
|
{ .compatible = "regulator-gpio", },
|
||||||
|
@ -357,7 +348,6 @@ MODULE_DEVICE_TABLE(of, regulator_gpio_of_match);
|
||||||
|
|
||||||
static struct platform_driver gpio_regulator_driver = {
|
static struct platform_driver gpio_regulator_driver = {
|
||||||
.probe = gpio_regulator_probe,
|
.probe = gpio_regulator_probe,
|
||||||
.remove = gpio_regulator_remove,
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "gpio-regulator",
|
.name = "gpio-regulator",
|
||||||
.of_match_table = of_match_ptr(regulator_gpio_of_match),
|
.of_match_table = of_match_ptr(regulator_gpio_of_match),
|
||||||
|
|
Loading…
Reference in New Issue