Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / power / regulator / sandbox.c

diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 2cca579a571a550a8b3ee78125466bd76f665496..f980a17389ebbec62be112cdd442e99cb0812697 100644 (file)
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -87,7 +87,7 @@ int out_get_value(struct udevice *dev, int output_count, int reg_type,
        int ret;
 
        if (dev->driver_data > output_count) {
-               error("Unknown regulator number: %lu for PMIC %s!",
+               pr_err("Unknown regulator number: %lu for PMIC %s!",
                      dev->driver_data, dev->name);
                return -EINVAL;
        }
@@ -95,7 +95,7 @@ int out_get_value(struct udevice *dev, int output_count, int reg_type,
        reg = (dev->driver_data - 1) * OUT_REG_COUNT + reg_type;
        ret = pmic_read(dev->parent, reg, &reg_val, 1);
        if (ret) {
-               error("PMIC read failed: %d\n",  ret);
+               pr_err("PMIC read failed: %d\n",  ret);
                return ret;
        }
 
@@ -115,14 +115,14 @@ static int out_set_value(struct udevice *dev, int output_count, int reg_type,
        int max_value;
 
        if (dev->driver_data > output_count) {
-               error("Unknown regulator number: %lu for PMIC %s!",
+               pr_err("Unknown regulator number: %lu for PMIC %s!",
                      dev->driver_data, dev->name);
                return -EINVAL;
        }
 
        max_value = range[dev->driver_data - 1].max;
        if (value > max_value) {
-               error("Wrong value for %s: %lu. Max is: %d.",
+               pr_err("Wrong value for %s: %lu. Max is: %d.",
                      dev->name, dev->driver_data, max_value);
                return -EINVAL;
        }
@@ -134,7 +134,7 @@ static int out_set_value(struct udevice *dev, int output_count, int reg_type,
        reg = (dev->driver_data - 1) * OUT_REG_COUNT + reg_type;
        ret = pmic_write(dev->parent, reg, &reg_val, 1);
        if (ret) {
-               error("PMIC write failed: %d\n",  ret);
+               pr_err("PMIC write failed: %d\n",  ret);
                return ret;
        }
 
@@ -154,7 +154,7 @@ static int out_get_mode(struct udevice *dev)
        reg = (dev->driver_data - 1) * OUT_REG_COUNT + OUT_REG_OM;
        ret = pmic_read(dev->parent, reg, &reg_val, 1);
        if (ret) {
-               error("PMIC read failed: %d\n",  ret);
+               pr_err("PMIC read failed: %d\n",  ret);
                return ret;
        }
 
@@ -163,7 +163,7 @@ static int out_get_mode(struct udevice *dev)
                        return uc_pdata->mode[i].id;
        }
 
-       error("Unknown operation mode for %s!", dev->name);
+       pr_err("Unknown operation mode for %s!", dev->name);
        return -EINVAL;
 }
 
@@ -188,14 +188,14 @@ static int out_set_mode(struct udevice *dev, int mode)
        }
 
        if (reg_val == -1) {
-               error("Unknown operation mode for %s!", dev->name);
+               pr_err("Unknown operation mode for %s!", dev->name);
                return -EINVAL;
        }
 
        reg = (dev->driver_data - 1) * OUT_REG_COUNT + OUT_REG_OM;
        ret = pmic_write(dev->parent, reg, (uint8_t *)&reg_val, 1);
        if (ret) {
-               error("PMIC write failed: %d\n",  ret);
+               pr_err("PMIC write failed: %d\n",  ret);
                return ret;
        }
 
@@ -234,7 +234,7 @@ static int buck_set_current(struct udevice *dev, int uA)
                              buck_current_range, uA);
 }
 
-static bool buck_get_enable(struct udevice *dev)
+static int buck_get_enable(struct udevice *dev)
 {
        if (out_get_mode(dev) == BUCK_OM_OFF)
                return false;
@@ -310,7 +310,7 @@ static int ldo_set_current(struct udevice *dev, int uA)
                             ldo_current_range, uA);
 }
 
-static bool ldo_get_enable(struct udevice *dev)
+static int ldo_get_enable(struct udevice *dev)
 {
        if (out_get_mode(dev) == LDO_OM_OFF)
                return false;