Merge remote-tracking branch 'regulator/topic/tps6105x' into regulator-next

diff --combined drivers/regulator/tps6105x-regulator.c
index e0e818d89f46673aa50f11377cec58b83cbb6e04,3346e78fb960d3f8c222672509453d46ca6f2cda..c1e33a3d397b6a62b88fc14e8e2fc0c1ae6a8ec2
--- 1/drivers/regulator/tps6105x-regulator.c
--- 2/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@@ -137,7 -137,7 +137,7 @@@ static int tps6105x_regulator_probe(str
        /* This instance is not set for regulator mode so bail out */
        if (pdata->mode != TPS6105X_MODE_VOLTAGE) {
                dev_info(&pdev->dev,
-                        "chip not in voltage mode mode, exit probe \n");
+                       "chip not in voltage mode mode, exit probe\n");
                return 0;
        }
  
@@@ -146,9 -146,8 +146,9 @@@
        config.driver_data = tps6105x;
  
        /* Register regulator with framework */
 -      tps6105x->regulator = regulator_register(&tps6105x_regulator_desc,
 -                                               &config);
 +      tps6105x->regulator = devm_regulator_register(&pdev->dev,
 +                                                    &tps6105x_regulator_desc,
 +                                                    &config);
        if (IS_ERR(tps6105x->regulator)) {
                ret = PTR_ERR(tps6105x->regulator);
                dev_err(&tps6105x->client->dev,
@@@ -160,12 -159,20 +160,12 @@@
        return 0;
  }
  
 -static int tps6105x_regulator_remove(struct platform_device *pdev)
 -{
 -      struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
 -      regulator_unregister(tps6105x->regulator);
 -      return 0;
 -}
 -
  static struct platform_driver tps6105x_regulator_driver = {
        .driver = {
                .name  = "tps6105x-regulator",
                .owner = THIS_MODULE,
        },
        .probe = tps6105x_regulator_probe,
 -      .remove = tps6105x_regulator_remove,
  };
  
  static __init int tps6105x_regulator_init(void)