Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (27 commits)
  regulator: wm831x_reg_read() failure unnoticed in wm831x_aldo_get_mode()
  twl-regulator: Fix reg_disable functionality for 4030 and 6030
  twl-regulator: Add turnon delay to reg_enable
  twl-regulator: Restore REMAP configuration in regulator probe
  twl-regulator: Add turnon-delay and REMAP config to twlreg_info struct
  twl-regulator: Define critical regulators as always_on
  twl-regulator: Add all twl4030 regulators to twlreg_info
  regulator: mc13783-regulator: correct the probing time.
  regulator: Fix unbalanced disables/enables in regulator_bulk_{enable,disable} error path
  regulator: core.c: Small coding style cleanup (indentation fixup)
  drivers/regulator: use PTR_ERR to get error code
  regulator: consumer.h - fix build when consumer.h is #included first.
  regulator/mc13783: various cleanups
  regulator/mc13783: rename source file to match other drivers
  Fix some AB3100 regulator issues
  regulator: keep index within bounds in da9034_get_ldo12_voltage()
  regulator: Ensure val is initialised in 88pm8607 choose_voltage()
  regulator: Remove duplicate consts from ab3100
  regulator: Handle regulators without suspend mode configuration
  regulator: Factor out regulator name pretty printing
  ...

1 files changed, 7 insertions, 26 deletions

diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index 49aeee823a25..b349db4504b7 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -81,7 +81,7 @@ static const u8 ab3100_reg_init_order[AB3100_NUM_REGULATORS+2] = {
 #define LDO_C_VOLTAGE 2650000
 #define LDO_D_VOLTAGE 2650000
 
-static const int const ldo_e_buck_typ_voltages[] = {
+static const int ldo_e_buck_typ_voltages[] = {
         1800000,
         1400000,
         1300000,
@@ -91,7 +91,7 @@ static const int const ldo_e_buck_typ_voltages[] = {
         900000,
 };
 
-static const int const ldo_f_typ_voltages[] = {
+static const int ldo_f_typ_voltages[] = {
         1800000,
         1400000,
         1300000,
@@ -102,21 +102,21 @@ static const int const ldo_f_typ_voltages[] = {
         2650000,
 };
 
-static const int const ldo_g_typ_voltages[] = {
+static const int ldo_g_typ_voltages[] = {
         2850000,
         2750000,
         1800000,
         1500000,
 };
 
-static const int const ldo_h_typ_voltages[] = {
+static const int ldo_h_typ_voltages[] = {
         2750000,
         1800000,
         1500000,
         1200000,
 };
 
-static const int const ldo_k_typ_voltages[] = {
+static const int ldo_k_typ_voltages[] = {
         2750000,
         1800000,
 };
@@ -241,24 +241,12 @@ static int ab3100_disable_regulator(struct regulator_dev *reg)
          * LDO D is a special regulator. When it is disabled, the entire
          * system is shut down. So this is handled specially.
          */
+        pr_info("Called ab3100_disable_regulator\n");
         if (abreg->regreg == AB3100_LDO_D) {
-                int i;
-
                 dev_info(&reg->dev, "disabling LDO D - shut down system\n");
-                /*
-                 * Set regulators to default values, ignore any errors,
-                 * we're going DOWN
-                 */
-                for (i = 0; i < ARRAY_SIZE(ab3100_reg_init_order); i++) {
-                        (void) ab3100_set_register_interruptible(abreg->ab3100,
-                                        ab3100_reg_init_order[i],
-                                        abreg->plfdata->reg_initvals[i]);
-                }
-
                 /* Setting LDO D to 0x00 cuts the power to the SoC */
                 return ab3100_set_register_interruptible(abreg->ab3100,
                                                          AB3100_LDO_D, 0x00U);
-
         }
 
         /*
@@ -607,13 +595,6 @@ static int __init ab3100_regulators_probe(struct platform_device *pdev)
                 }
         }
 
-        if (err) {
-                dev_err(&pdev->dev,
-                        "LDO D regulator initialization failed with error %d\n",
-                        err);
-                return err;
-        }
-
         /* Register the regulators */
         for (i = 0; i < AB3100_NUM_REGULATORS; i++) {
                 struct ab3100_regulator *reg = &ab3100_regulators[i];
@@ -688,7 +669,7 @@ static __init int ab3100_regulators_init(void)
 
 static __exit void ab3100_regulators_exit(void)
 {
-        platform_driver_register(&ab3100_regulators_driver);
+        platform_driver_unregister(&ab3100_regulators_driver);
 }
 
 subsys_initcall(ab3100_regulators_init);