regulator: gpio: Convert to devm_regulator_register
PATCH 1/2 regulator: gpio: Convert to devm_regulator_register
Use devm_regulator_register to simplify the code.
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/gpio-regulator.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/regulator/gpio-regulator.c +4 -14
@@ -36,7 +36,6 @@struct gpio_regulator_data {struct regulator_desc desc; -struct regulator_dev *dev;struct gpio_desc **gpiods;int nr_gpios;
@@ -233,6 +232,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct gpio_regulator_data *drvdata;struct regulator_config cfg = { }; +struct regulator_dev *rdev;enum gpiod_flags gflags;int ptr, ret, state, i;
@@ -326,9 +326,9 @@ static int gpio_regulator_probe(struct platform_device *pdev)if (IS_ERR (cfg.ena_gpiod))return PTR_ERR (cfg.ena_gpiod); - drvdata->dev =regulator_register (&drvdata->desc, &cfg); -if (IS_ERR (drvdata->dev)) { - ret =PTR_ERR (drvdata->dev); + rdev =devm_regulator_register (dev, &drvdata->desc, &cfg); +if (IS_ERR (rdev)) { + ret =PTR_ERR (rdev);dev_err (dev,"Failed to register regulator: %d\n" , ret);return ret; }
@@ -338,15 +338,6 @@ static int gpio_regulator_probe(struct platform_device *pdev)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 )static const struct of_device_id regulator_gpio_of_match[] = { { .compatible = "regulator-gpio", },
@@ -357,7 +348,6 @@ MODULE_DEVICE_TABLE(of, regulator_gpio_of_match);static struct platform_driver gpio_regulator_driver = { .probe = gpio_regulator_probe, - .remove = gpio_regulator_remove, .driver = { .name ="gpio-regulator" , .of_match_table =of_match_ptr (regulator_gpio_of_match),
Signature · 1 line
2.17.1
PATCH 2/2 regulator: gpio: Constify regulator_ops
gpio_regulator_voltage_ops and gpio_regulator_current_ops should never change, make them const.
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/gpio-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/gpio-regulator.c +2 -2
@@ -124,7 +124,7 @@ static int gpio_regulator_set_current_limit(struct regulator_dev *dev,return 0 ; } -static struct regulator_ops gpio_regulator_voltage_ops = { +static const struct regulator_ops gpio_regulator_voltage_ops = { .get_voltage = gpio_regulator_get_value, .set_voltage = gpio_regulator_set_voltage, .list_voltage = gpio_regulator_list_voltage,
@@ -220,7 +220,7 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,return config; } -static struct regulator_ops gpio_regulator_current_ops = { +static const struct regulator_ops gpio_regulator_current_ops = { .get_current_limit = gpio_regulator_get_value, .set_current_limit = gpio_regulator_set_current_limit, };
Signature · 1 line
2.17.1