Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / drivers / regulator / gpio-regulator.c

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 6157001df0a49f5d2753677b0a90ba57e3b759a0..110ee6fe76c4cfcccde53530aec9fb80ad9edfc8 100644 (file)
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * gpio-regulator.c
  *
@@ -12,11 +13,6 @@
  * Copyright (c) 2009 Nokia Corporation
  * Roger Quadros <ext-roger.quadros@nokia.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
  * This is useful for systems with mixed controllable and
  * non-controllable regulators, as well as for allowing testing on
  * systems with no controllable regulators.
@@ -36,7 +32,6 @@
 
 struct gpio_regulator_data {
        struct regulator_desc desc;
-       struct regulator_dev *dev;
 
        struct gpio_desc **gpiods;
        int nr_gpios;
@@ -125,7 +120,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,
@@ -221,7 +216,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,
 };
@@ -233,6 +228,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 +322,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 +334,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 +344,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),