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

diff --combined drivers/regulator/lp8788-buck.c
index 6cc02c35ddb5145f4eee79e6ad395c8f009abfec,fab2590dc58ef19292d2f245d14d4d4f6d86edd4..aef3f2b0c5ea433e45647f1c10a7a429d416a234
--- 1/drivers/regulator/lp8788-buck.c
--- 2/drivers/regulator/lp8788-buck.c
+++ b/drivers/regulator/lp8788-buck.c
@@@ -429,18 -429,6 +429,6 @@@ static struct regulator_desc lp8788_buc
        },
  };
  
- static int _gpio_request(struct lp8788_buck *buck, int gpio, char *name)
- {
-       struct device *dev = buck->lp->dev;
- 
-       if (!gpio_is_valid(gpio)) {
-               dev_err(dev, "invalid gpio: %d\n", gpio);
-               return -EINVAL;
-       }
- 
-       return devm_gpio_request_one(dev, gpio, DVS_LOW, name);
- }
- 
  static int lp8788_dvs_gpio_request(struct lp8788_buck *buck,
                                enum lp8788_buck_id id)
  {
@@@ -452,7 -440,8 +440,8 @@@
        switch (id) {
        case BUCK1:
                gpio = pdata->buck1_dvs->gpio;
-               ret = _gpio_request(buck, gpio, b1_name);
+               ret = devm_gpio_request_one(buck->lp->dev, gpio, DVS_LOW,
+                                           b1_name);
                if (ret)
                        return ret;
  
@@@ -461,7 -450,8 +450,8 @@@
        case BUCK2:
                for (i = 0 ; i < LP8788_NUM_BUCK2_DVS ; i++) {
                        gpio = pdata->buck2_dvs->gpio[i];
-                       ret = _gpio_request(buck, gpio, b2_name[i]);
+                       ret = devm_gpio_request_one(buck->lp->dev, gpio,
+                                                   DVS_LOW, b2_name[i]);
                        if (ret)
                                return ret;
                }
@@@ -504,7 -494,7 +494,7 @@@ set_default_dvs_mode
                                  default_dvs_mode[id]);
  }
  
 -static __devinit int lp8788_buck_probe(struct platform_device *pdev)
 +static int lp8788_buck_probe(struct platform_device *pdev)
  {
        struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
        int id = pdev->id;
@@@ -542,7 -532,7 +532,7 @@@
        return 0;
  }
  
 -static int __devexit lp8788_buck_remove(struct platform_device *pdev)
 +static int lp8788_buck_remove(struct platform_device *pdev)
  {
        struct lp8788_buck *buck = platform_get_drvdata(pdev);
  
@@@ -554,7 -544,7 +544,7 @@@
  
  static struct platform_driver lp8788_buck_driver = {
        .probe = lp8788_buck_probe,
 -      .remove = __devexit_p(lp8788_buck_remove),
 +      .remove = lp8788_buck_remove,
        .driver = {
                .name = LP8788_DEV_BUCK,
                .owner = THIS_MODULE,

diff --combined drivers/regulator/lp8788-ldo.c
index 26753a0137892c909cd323d80da2e9388cdf4519,40897eb2c29e48346b2f28e74c295da756b75394..3792741708ce65b4b0bbb3449643baef4a21b22c
--- 1/drivers/regulator/lp8788-ldo.c
--- 2/drivers/regulator/lp8788-ldo.c
+++ b/drivers/regulator/lp8788-ldo.c
@@@ -126,7 -126,7 +126,7 @@@ struct lp8788_ldo 
  };
  
  /* DLDO 1, 2, 3, 9 voltage table */
- const int lp8788_dldo1239_vtbl[] = {
+ static const int lp8788_dldo1239_vtbl[] = {
        1800000, 1900000, 2000000, 2100000, 2200000, 2300000, 2400000, 2500000,
        2600000, 2700000, 2800000, 2900000, 3000000, 2850000, 2850000, 2850000,
        2850000, 2850000, 2850000, 2850000, 2850000, 2850000, 2850000, 2850000,
@@@ -662,14 -662,6 +662,6 @@@ static int lp8788_config_ldo_enable_mod
                [EN_DLDO7]   = LP8788_EN_SEL_DLDO7_M,
                [EN_DLDO911] = LP8788_EN_SEL_DLDO911_M,
        };
-       u8 val[] = {
-               [EN_ALDO1]   = 0 << 5,
-               [EN_ALDO234] = 0 << 4,
-               [EN_ALDO5]   = 0 << 3,
-               [EN_ALDO7]   = 0 << 2,
-               [EN_DLDO7]   = 0 << 1,
-               [EN_DLDO911] = 0 << 0,
-       };
  
        switch (id) {
        case DLDO7:
@@@ -708,11 -700,10 +700,10 @@@
        return ret;
  
  set_default_ldo_enable_mode:
-       return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id],
-                               val[enable_id]);
+       return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id], 0);
  }
  
 -static __devinit int lp8788_dldo_probe(struct platform_device *pdev)
 +static int lp8788_dldo_probe(struct platform_device *pdev)
  {
        struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
        int id = pdev->id;
@@@ -749,7 -740,7 +740,7 @@@
        return 0;
  }
  
 -static int __devexit lp8788_dldo_remove(struct platform_device *pdev)
 +static int lp8788_dldo_remove(struct platform_device *pdev)
  {
        struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
  
@@@ -761,14 -752,14 +752,14 @@@
  
  static struct platform_driver lp8788_dldo_driver = {
        .probe = lp8788_dldo_probe,
 -      .remove = __devexit_p(lp8788_dldo_remove),
 +      .remove = lp8788_dldo_remove,
        .driver = {
                .name = LP8788_DEV_DLDO,
                .owner = THIS_MODULE,
        },
  };
  
 -static __devinit int lp8788_aldo_probe(struct platform_device *pdev)
 +static int lp8788_aldo_probe(struct platform_device *pdev)
  {
        struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
        int id = pdev->id;
@@@ -805,7 -796,7 +796,7 @@@
        return 0;
  }
  
 -static int __devexit lp8788_aldo_remove(struct platform_device *pdev)
 +static int lp8788_aldo_remove(struct platform_device *pdev)
  {
        struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
  
@@@ -817,7 -808,7 +808,7 @@@
  
  static struct platform_driver lp8788_aldo_driver = {
        .probe = lp8788_aldo_probe,
 -      .remove = __devexit_p(lp8788_aldo_remove),
 +      .remove = lp8788_aldo_remove,
        .driver = {
                .name = LP8788_DEV_ALDO,
                .owner = THIS_MODULE,