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

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

diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 0a60a9cfc6a20d26ad0db54b6abceaead93cc1b6..1031a0362b676ff98cc92f653c6aefd2ef51c76f 100644 (file)
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -30,7 +30,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)
        struct gpio_regulator_platdata *dev_pdata;
        struct gpio_desc *gpio;
        const void *blob = gd->fdt_blob;
-       int node = dev->of_offset;
+       int node = dev_of_offset(dev);
        int ret, count, i, j;
        u32 states_array[8];
 
@@ -109,7 +109,7 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV)
 
        ret = dm_gpio_set_value(&dev_pdata->gpio, enable);
        if (ret) {
-               error("Can't set regulator : %s gpio to: %d\n", dev->name,
+               pr_err("Can't set regulator : %s gpio to: %d\n", dev->name,
                      enable);
                return ret;
        }