arm: imx6: defconfig: update tx6 defconfigs

[karo-tx-linux.git] / drivers / regulator / tps6524x-regulator.c

diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 62e8d28beabd7cc8ad51b2935e29b7d348e17438..9f6bfda711b73a6dae9cdc9b8be3b69b2f5e88cc 100644 (file)
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -577,21 +577,6 @@ static struct regulator_ops regulator_ops = {
        .get_current_limit      = get_current_limit,
 };
 
-static int pmic_remove(struct spi_device *spi)
-{
-       struct tps6524x *hw = spi_get_drvdata(spi);
-       int i;
-
-       if (!hw)
-               return 0;
-       for (i = 0; i < N_REGULATORS; i++) {
-               regulator_unregister(hw->rdev[i]);
-               hw->rdev[i] = NULL;
-       }
-       spi_set_drvdata(spi, NULL);
-       return 0;
-}
-
 static int pmic_probe(struct spi_device *spi)
 {
        struct tps6524x *hw;
@@ -599,7 +584,7 @@ static int pmic_probe(struct spi_device *spi)
        const struct supply_info *info = supply_info;
        struct regulator_init_data *init_data;
        struct regulator_config config = { };
-       int ret = 0, i;
+       int i;
 
        init_data = dev_get_platdata(dev);
        if (!init_data) {
@@ -632,24 +617,17 @@ static int pmic_probe(struct spi_device *spi)
                config.init_data = init_data;
                config.driver_data = hw;
 
-               hw->rdev[i] = regulator_register(&hw->desc[i], &config);
-               if (IS_ERR(hw->rdev[i])) {
-                       ret = PTR_ERR(hw->rdev[i]);
-                       hw->rdev[i] = NULL;
-                       goto fail;
-               }
+               hw->rdev[i] = devm_regulator_register(dev, &hw->desc[i],
+                                                     &config);
+               if (IS_ERR(hw->rdev[i]))
+                       return PTR_ERR(hw->rdev[i]);
        }
 
        return 0;
-
-fail:
-       pmic_remove(spi);
-       return ret;
 }
 
 static struct spi_driver pmic_driver = {
        .probe          = pmic_probe,
-       .remove         = pmic_remove,
        .driver         = {
                .name   = "tps6524x",
                .owner  = THIS_MODULE,