13 files changed, 321 insertions, 68 deletions

diff --git a/Documentation/devicetree/bindings/mfd/tps65910.txt b/Documentation/devicetree/bindings/mfd/tps65910.txt
index b4bd98af1cc7..38833e63a59f 100644
--- a/Documentation/devicetree/bindings/mfd/tps65910.txt
+++ b/Documentation/devicetree/bindings/mfd/tps65910.txt
@@ -11,7 +11,7 @@ Required properties:
 - #interrupt-cells: the number of cells to describe an IRQ, this should be 2.
   The first cell is the IRQ number.
   The second cell is the flags, encoded as the trigger masks from
-  Documentation/devicetree/bindings/interrupts.txt
+  Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
 - regulators: This is the list of child nodes that specify the regulator
   initialization data for defined regulators. Not all regulators for the given
   device need to be present. The definition for each of these nodes is defined
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8f3866c44a3f..1cd8584a7b88 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -535,6 +535,15 @@ config REGULATOR_TPS65217
           voltage regulators. It supports software based voltage control
           for different voltage domains
 
+config REGULATOR_TPS65218
+        tristate "TI TPS65218 Power regulators"
+        depends on MFD_TPS65218 && OF
+        help
+          This driver supports TPS65218 voltage regulator chips. TPS65218
+          provides six step-down converters and one general-purpose LDO
+          voltage regulators. It supports software based voltage control
+          for different voltage domains
+
 config REGULATOR_TPS6524X
         tristate "TI TPS6524X Power regulators"
         depends on SPI
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 0cfca37941ec..f0fe0c50b59c 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -70,6 +70,7 @@ obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
 obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS65090) += tps65090-regulator.o
 obj-$(CONFIG_REGULATOR_TPS65217) += tps65217-regulator.o
+obj-$(CONFIG_REGULATOR_TPS65218) += tps65218-regulator.o
 obj-$(CONFIG_REGULATOR_TPS6524X) += tps6524x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
new file mode 100644
index 000000000000..cec72fa71d1d
--- /dev/null
+++ b/drivers/regulator/tps65218-regulator.c
@@ -0,0 +1,285 @@
+/*
+ * tps65218-regulator.c
+ *
+ * Regulator driver for TPS65218 PMIC
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/of_device.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/mfd/tps65218.h>
+
+static unsigned int tps65218_ramp_delay = 4000;
+
+enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 };
+
+#define TPS65218_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _er, _em, _t, \
+                            _lr, _nlr)                          \
+        {                                                       \
+                .name                   = _name,                \
+                .id                     = _id,                  \
+                .ops                    = &_ops,                \
+                .n_voltages             = _n,                   \
+                .type                   = REGULATOR_VOLTAGE,    \
+                .owner                  = THIS_MODULE,          \
+                .vsel_reg               = _vr,                  \
+                .vsel_mask              = _vm,                  \
+                .enable_reg             = _er,                  \
+                .enable_mask            = _em,                  \
+                .volt_table             = _t,                   \
+                .linear_ranges          = _lr,                  \
+                .n_linear_ranges        = _nlr,                 \
+        }                                                       \
+
+#define TPS65218_INFO(_id, _nm, _min, _max)     \
+        {                                               \
+                .id             = _id,                  \
+                .name           = _nm,                  \
+                .min_uV         = _min,                 \
+                .max_uV         = _max,                 \
+        }
+
+static const struct regulator_linear_range dcdc1_dcdc2_ranges[] = {
+        REGULATOR_LINEAR_RANGE(850000, 0x0, 0x32, 10000),
+        REGULATOR_LINEAR_RANGE(1375000, 0x33, 0x3f, 25000),
+};
+
+static const struct regulator_linear_range ldo1_dcdc3_ranges[] = {
+        REGULATOR_LINEAR_RANGE(900000, 0x0, 0x1a, 25000),
+        REGULATOR_LINEAR_RANGE(1600000, 0x1b, 0x3f, 50000),
+};
+
+static const struct regulator_linear_range dcdc4_ranges[] = {
+        REGULATOR_LINEAR_RANGE(1175000, 0x0, 0xf, 25000),
+        REGULATOR_LINEAR_RANGE(1550000, 0x10, 0x34, 50000),
+};
+
+static struct tps_info tps65218_pmic_regs[] = {
+        TPS65218_INFO(0, "DCDC1", 850000, 167500),
+        TPS65218_INFO(1, "DCDC2", 850000, 1675000),
+        TPS65218_INFO(2, "DCDC3", 900000, 3400000),
+        TPS65218_INFO(3, "DCDC4", 1175000, 3400000),
+        TPS65218_INFO(4, "DCDC5", 1000000, 1000000),
+        TPS65218_INFO(5, "DCDC6", 1800000, 1800000),
+        TPS65218_INFO(6, "LDO1", 900000, 3400000),
+};
+
+#define TPS65218_OF_MATCH(comp, label) \
+        { \
+                .compatible = comp, \
+                .data = &label, \
+        }
+
+static const struct of_device_id tps65218_of_match[] = {
+        TPS65218_OF_MATCH("ti,tps65218-dcdc1", tps65218_pmic_regs[DCDC1]),
+        TPS65218_OF_MATCH("ti,tps65218-dcdc2", tps65218_pmic_regs[DCDC2]),
+        TPS65218_OF_MATCH("ti,tps65218-dcdc3", tps65218_pmic_regs[DCDC3]),
+        TPS65218_OF_MATCH("ti,tps65218-dcdc4", tps65218_pmic_regs[DCDC4]),
+        TPS65218_OF_MATCH("ti,tps65218-dcdc5", tps65218_pmic_regs[DCDC5]),
+        TPS65218_OF_MATCH("ti,tps65218-dcdc6", tps65218_pmic_regs[DCDC6]),
+        TPS65218_OF_MATCH("ti,tps65218-ldo1", tps65218_pmic_regs[LDO1]),
+        { }
+};
+MODULE_DEVICE_TABLE(of, tps65218_of_match);
+
+static int tps65218_pmic_set_voltage_sel(struct regulator_dev *dev,
+                                         unsigned selector)
+{
+        int ret;
+        struct tps65218 *tps = rdev_get_drvdata(dev);
+        unsigned int rid = rdev_get_id(dev);
+
+        /* Set the voltage based on vsel value and write protect level is 2 */
+        ret = tps65218_set_bits(tps, dev->desc->vsel_reg, dev->desc->vsel_mask,
+                                selector, TPS65218_PROTECT_L1);
+
+        /* Set GO bit for DCDC1/2 to initiate voltage transistion */
+        switch (rid) {
+        case TPS65218_DCDC_1:
+        case TPS65218_DCDC_2:
+                ret = tps65218_set_bits(tps, TPS65218_REG_CONTRL_SLEW_RATE,
+                                        TPS65218_SLEW_RATE_GO,
+                                        TPS65218_SLEW_RATE_GO,
+                                        TPS65218_PROTECT_L1);
+                break;
+        }
+
+        return ret;
+}
+
+static int tps65218_pmic_enable(struct regulator_dev *dev)
+{
+        struct tps65218 *tps = rdev_get_drvdata(dev);
+        unsigned int rid = rdev_get_id(dev);
+
+        if (rid < TPS65218_DCDC_1 || rid > TPS65218_LDO_1)
+                return -EINVAL;
+
+        /* Enable the regulator and password protection is level 1 */
+        return tps65218_set_bits(tps, dev->desc->enable_reg,
+                                 dev->desc->enable_mask, dev->desc->enable_mask,
+                                 TPS65218_PROTECT_L1);
+}
+
+static int tps65218_pmic_disable(struct regulator_dev *dev)
+{
+        struct tps65218 *tps = rdev_get_drvdata(dev);
+        unsigned int rid = rdev_get_id(dev);
+
+        if (rid < TPS65218_DCDC_1 || rid > TPS65218_LDO_1)
+                return -EINVAL;
+
+        /* Disable the regulator and password protection is level 1 */
+        return tps65218_clear_bits(tps, dev->desc->enable_reg,
+                                   dev->desc->enable_mask, TPS65218_PROTECT_L1);
+}
+
+static int tps65218_set_voltage_time_sel(struct regulator_dev *rdev,
+        unsigned int old_selector, unsigned int new_selector)
+{
+        int old_uv, new_uv;
+
+        old_uv = regulator_list_voltage_linear_range(rdev, old_selector);
+        if (old_uv < 0)
+                return old_uv;
+
+        new_uv = regulator_list_voltage_linear_range(rdev, new_selector);
+        if (new_uv < 0)
+                return new_uv;
+
+        return DIV_ROUND_UP(abs(old_uv - new_uv), tps65218_ramp_delay);
+}
+
+/* Operations permitted on DCDC1, DCDC2 */
+static struct regulator_ops tps65218_dcdc12_ops = {
+        .is_enabled             = regulator_is_enabled_regmap,
+        .enable                 = tps65218_pmic_enable,
+        .disable                = tps65218_pmic_disable,
+        .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel        = tps65218_pmic_set_voltage_sel,
+        .list_voltage           = regulator_list_voltage_linear_range,
+        .map_voltage            = regulator_map_voltage_linear_range,
+        .set_voltage_time_sel   = tps65218_set_voltage_time_sel,
+};
+
+/* Operations permitted on DCDC3, DCDC4 and LDO1 */
+static struct regulator_ops tps65218_ldo1_dcdc34_ops = {
+        .is_enabled             = regulator_is_enabled_regmap,
+        .enable                 = tps65218_pmic_enable,
+        .disable                = tps65218_pmic_disable,
+        .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel        = tps65218_pmic_set_voltage_sel,
+        .list_voltage           = regulator_list_voltage_linear_range,
+        .map_voltage            = regulator_map_voltage_linear_range,
+};
+
+/* Operations permitted on DCDC5, DCDC6 */
+static struct regulator_ops tps65218_dcdc56_pmic_ops = {
+        .is_enabled             = regulator_is_enabled_regmap,
+        .enable                 = tps65218_pmic_enable,
+        .disable                = tps65218_pmic_disable,
+};
+
+static const struct regulator_desc regulators[] = {
+        TPS65218_REGULATOR("DCDC1", TPS65218_DCDC_1, tps65218_dcdc12_ops, 64,
+                           TPS65218_REG_CONTROL_DCDC1,
+                           TPS65218_CONTROL_DCDC1_MASK,
+                           TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC1_EN, NULL,
+                           dcdc1_dcdc2_ranges, 2),
+        TPS65218_REGULATOR("DCDC2", TPS65218_DCDC_2, tps65218_dcdc12_ops, 64,
+                           TPS65218_REG_CONTROL_DCDC2,
+                           TPS65218_CONTROL_DCDC2_MASK,
+                           TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC2_EN, NULL,
+                           dcdc1_dcdc2_ranges, 2),
+        TPS65218_REGULATOR("DCDC3", TPS65218_DCDC_3, tps65218_ldo1_dcdc34_ops,
+                           64, TPS65218_REG_CONTROL_DCDC3,
+                           TPS65218_CONTROL_DCDC3_MASK, TPS65218_REG_ENABLE1,
+                           TPS65218_ENABLE1_DC3_EN, NULL,
+                           ldo1_dcdc3_ranges, 2),
+        TPS65218_REGULATOR("DCDC4", TPS65218_DCDC_4, tps65218_ldo1_dcdc34_ops,
+                           53, TPS65218_REG_CONTROL_DCDC4,
+                           TPS65218_CONTROL_DCDC4_MASK,
+                           TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC4_EN, NULL,
+                           dcdc4_ranges, 2),
+        TPS65218_REGULATOR("DCDC5", TPS65218_DCDC_5, tps65218_dcdc56_pmic_ops,
+                           1, -1, -1, TPS65218_REG_ENABLE1,
+                           TPS65218_ENABLE1_DC5_EN, NULL, NULL, 0),
+        TPS65218_REGULATOR("DCDC6", TPS65218_DCDC_6, tps65218_dcdc56_pmic_ops,
+                           1, -1, -1, TPS65218_REG_ENABLE1,
+                           TPS65218_ENABLE1_DC6_EN, NULL, NULL, 0),
+        TPS65218_REGULATOR("LDO1", TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64,
+                           TPS65218_REG_CONTROL_DCDC4,
+                           TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,
+                           TPS65218_ENABLE2_LDO1_EN, NULL, ldo1_dcdc3_ranges,
+                           2),
+};
+
+static int tps65218_regulator_probe(struct platform_device *pdev)
+{
+        struct tps65218 *tps = dev_get_drvdata(pdev->dev.parent);
+        struct regulator_init_data *init_data;
+        const struct tps_info   *template;
+        struct regulator_dev *rdev;
+        const struct of_device_id       *match;
+        struct regulator_config config = { };
+        int id;
+
+        match = of_match_device(tps65218_of_match, &pdev->dev);
+        if (!match)
+                return -ENODEV;
+
+        template = match->data;
+        id = template->id;
+        init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node);
+
+        platform_set_drvdata(pdev, tps);
+
+        tps->info[id] = &tps65218_pmic_regs[id];
+        config.dev = &pdev->dev;
+        config.init_data = init_data;
+        config.driver_data = tps;
+        config.regmap = tps->regmap;
+
+        rdev = devm_regulator_register(&pdev->dev, &regulators[id], &config);
+        if (IS_ERR(rdev)) {
+                dev_err(tps->dev, "failed to register %s regulator\n",
+                        pdev->name);
+                return PTR_ERR(rdev);
+        }
+
+        return 0;
+}
+
+static struct platform_driver tps65218_regulator_driver = {
+        .driver = {
+                .name = "tps65218-pmic",
+                .owner = THIS_MODULE,
+                .of_match_table = tps65218_of_match,
+        },
+        .probe = tps65218_regulator_probe,
+};
+
+module_platform_driver(tps65218_regulator_driver);
+
+MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>");
+MODULE_DESCRIPTION("TPS65218 voltage regulator driver");
+MODULE_ALIAS("platform:tps65218-pmic");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 9f6bfda711b7..5b494db9f95c 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -593,10 +593,9 @@ static int pmic_probe(struct spi_device *spi)
         }
 
         hw = devm_kzalloc(&spi->dev, sizeof(struct tps6524x), GFP_KERNEL);
-        if (!hw) {
-                dev_err(dev, "cannot allocate regulator private data\n");
+        if (!hw)
                 return -ENOMEM;
-        }
+
         spi_set_drvdata(spi, hw);
 
         memset(hw, 0, sizeof(struct tps6524x));
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 0485d47f0d8a..32f38a63d944 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -363,10 +363,8 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
         }
 
         pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-        if (!pdata) {
-                dev_err(&pdev->dev, "Memory alloction failed\n");
+        if (!pdata)
                 return NULL;
-        }
 
         for (i = 0; i < num; i++) {
                 int id;
@@ -398,7 +396,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
 {
         struct tps6586x_regulator *ri = NULL;
         struct regulator_config config = { };
-        struct regulator_dev **rdev;
+        struct regulator_dev *rdev;
         struct regulator_init_data *reg_data;
         struct tps6586x_platform_data *pdata;
         struct of_regulator_match *tps6586x_reg_matches = NULL;
@@ -418,13 +416,6 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        rdev = devm_kzalloc(&pdev->dev, TPS6586X_ID_MAX_REGULATOR *
-                                sizeof(*rdev), GFP_KERNEL);
-        if (!rdev) {
-                dev_err(&pdev->dev, "Mmemory alloc failed\n");
-                return -ENOMEM;
-        }
-
         version = tps6586x_get_version(pdev->dev.parent);
 
         for (id = 0; id < TPS6586X_ID_MAX_REGULATOR; ++id) {
@@ -451,12 +442,11 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
                 if (tps6586x_reg_matches)
                         config.of_node = tps6586x_reg_matches[id].of_node;
 
-                rdev[id] = devm_regulator_register(&pdev->dev, &ri->desc,
-                                                   &config);
-                if (IS_ERR(rdev[id])) {
+                rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
+                if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
                                         ri->desc.name);
-                        return PTR_ERR(rdev[id]);
+                        return PTR_ERR(rdev);
                 }
 
                 if (reg_data) {
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index f50dd847eebc..fa7db8847578 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -1011,11 +1011,8 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
 
         pmic_plat_data = devm_kzalloc(&pdev->dev, sizeof(*pmic_plat_data),
                                         GFP_KERNEL);
-
-        if (!pmic_plat_data) {
-                dev_err(&pdev->dev, "Failure to alloc pdata for regulators.\n");
+        if (!pmic_plat_data)
                 return NULL;
-        }
 
         np = of_node_get(pdev->dev.parent->of_node);
         regulators = of_get_child_by_name(np, "regulators");
@@ -1098,10 +1095,8 @@ static int tps65910_probe(struct platform_device *pdev)
         }
 
         pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
-        if (!pmic) {
-                dev_err(&pdev->dev, "Memory allocation failed for pmic\n");
+        if (!pmic)
                 return -ENOMEM;
-        }
 
         pmic->mfd = tps65910;
         platform_set_drvdata(pdev, pmic);
@@ -1130,24 +1125,18 @@ static int tps65910_probe(struct platform_device *pdev)
 
         pmic->desc = devm_kzalloc(&pdev->dev, pmic->num_regulators *
                         sizeof(struct regulator_desc), GFP_KERNEL);
-        if (!pmic->desc) {
-                dev_err(&pdev->dev, "Memory alloc fails for desc\n");
+        if (!pmic->desc)
                 return -ENOMEM;
-        }
 
         pmic->info = devm_kzalloc(&pdev->dev, pmic->num_regulators *
                         sizeof(struct tps_info *), GFP_KERNEL);
-        if (!pmic->info) {
-                dev_err(&pdev->dev, "Memory alloc fails for info\n");
+        if (!pmic->info)
                 return -ENOMEM;
-        }
 
         pmic->rdev = devm_kzalloc(&pdev->dev, pmic->num_regulators *
                         sizeof(struct regulator_dev *), GFP_KERNEL);
-        if (!pmic->rdev) {
-                dev_err(&pdev->dev, "Memory alloc fails for rdev\n");
+        if (!pmic->rdev)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < pmic->num_regulators && i < TPS65910_NUM_REGS;
                         i++, info++) {
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index 71f457a42623..26aa6d9c308f 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -115,7 +115,7 @@ static int tps80031_reg_is_enabled(struct regulator_dev *rdev)
                         ri->rinfo->state_reg, ret);
                 return ret;
         }
-        return ((reg_val & TPS80031_STATE_MASK) == TPS80031_STATE_ON);
+        return (reg_val & TPS80031_STATE_MASK) == TPS80031_STATE_ON;
 }
 
 static int tps80031_reg_enable(struct regulator_dev *rdev)
@@ -693,10 +693,8 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
 
         pmic = devm_kzalloc(&pdev->dev,
                         TPS80031_REGULATOR_MAX * sizeof(*pmic), GFP_KERNEL);
-        if (!pmic) {
-                dev_err(&pdev->dev, "mem alloc for pmic failed\n");
+        if (!pmic)
                 return -ENOMEM;
-        }
 
         for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) {
                 tps_pdata = pdata->regulator_pdata[num];
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 04cf9c16ef23..0d88a82ab2a2 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -469,10 +469,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
 
         dcdc = devm_kzalloc(&pdev->dev,  sizeof(struct wm831x_dcdc),
                             GFP_KERNEL);
-        if (dcdc == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!dcdc)
                 return -ENOMEM;
-        }
 
         dcdc->wm831x = wm831x;
 
@@ -622,10 +620,8 @@ static int wm831x_buckp_probe(struct platform_device *pdev)
 
         dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc),
                             GFP_KERNEL);
-        if (dcdc == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!dcdc)
                 return -ENOMEM;
-        }
 
         dcdc->wm831x = wm831x;
 
@@ -752,10 +748,8 @@ static int wm831x_boostp_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc), GFP_KERNEL);
-        if (dcdc == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!dcdc)
                 return -ENOMEM;
-        }
 
         dcdc->wm831x = wm831x;
 
@@ -842,10 +836,8 @@ static int wm831x_epe_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "Probing EPE%d\n", id + 1);
 
         dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc), GFP_KERNEL);
-        if (dcdc == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!dcdc)
                 return -ENOMEM;
-        }
 
         dcdc->wm831x = wm831x;
 
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 0339b886df5d..72e385e76a9d 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -165,10 +165,8 @@ static int wm831x_isink_probe(struct platform_device *pdev)
 
         isink = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_isink),
                              GFP_KERNEL);
-        if (isink == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!isink)
                 return -ENOMEM;
-        }
 
         isink->wm831x = wm831x;
 
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 46d6700467b5..eca0eeb78acd 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -235,10 +235,8 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
         ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
-        if (ldo == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!ldo)
                 return -ENOMEM;
-        }
 
         ldo->wm831x = wm831x;
 
@@ -447,10 +445,8 @@ static int wm831x_aldo_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
         ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
-        if (ldo == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!ldo)
                 return -ENOMEM;
-        }
 
         ldo->wm831x = wm831x;
 
@@ -594,10 +590,8 @@ static int wm831x_alive_ldo_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
         ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
-        if (ldo == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!ldo)
                 return -ENOMEM;
-        }
 
         ldo->wm831x = wm831x;
 
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index de7b9c73e3fa..7ec7c390eeda 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -361,7 +361,7 @@ static int wm8350_dcdc_set_suspend_voltage(struct regulator_dev *rdev, int uV)
 
         sel = regulator_map_voltage_linear(rdev, uV, uV);
         if (sel < 0)
-                return -EINVAL;
+                return sel;
 
         /* all DCDCs have same mV bits */
         val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_DC1_VSEL_MASK;
@@ -574,7 +574,7 @@ static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)
 
         sel = regulator_map_voltage_linear_range(rdev, uV, uV);
         if (sel < 0)
-                return -EINVAL;
+                return sel;
 
         /* all LDOs have same mV bits */
         val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_LDO1_VSEL_MASK;
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 71c5911f2e71..c24346db8a71 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -134,10 +134,8 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
         ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL);
-        if (ldo == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate private data\n");
+        if (!ldo)
                 return -ENOMEM;
-        }
 
         ldo->wm8994 = wm8994;
         ldo->supply = wm8994_ldo_consumer[id];