Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / drivers / power / pmic / tps65090.c

diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c
index 4565e3b..5b1d19f 100644 (file)
--- a/drivers/power/pmic/tps65090.c
+++ b/drivers/power/pmic/tps65090.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2015 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -13,8 +12,6 @@
 #include <power/pmic.h>
 #include <power/tps65090.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 static const struct pmic_child_info pmic_children_info[] = {
        { .prefix = "fet", .driver = TPS65090_FET_DRIVER },
        { },
@@ -29,7 +26,7 @@ static int tps65090_write(struct udevice *dev, uint reg, const uint8_t *buff,
                          int len)
 {
        if (dm_i2c_write(dev, reg, buff, len)) {
-               error("write error to device: %p register: %#x!", dev, reg);
+               pr_err("write error to device: %p register: %#x!\n", dev, reg);
                return -EIO;
        }
 
@@ -42,8 +39,8 @@ static int tps65090_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
 
        ret = dm_i2c_read(dev, reg, buff, len);
        if (ret) {
-               error("read error %d from device: %p register: %#x!", ret, dev,
-                     reg);
+               pr_err("read error %d from device: %p register: %#x!\n", ret,
+                      dev, reg);
                return -EIO;
        }
 
@@ -57,7 +54,7 @@ static int tps65090_bind(struct udevice *dev)
 
        regulators_node = dev_read_subnode(dev, "regulators");
        if (!ofnode_valid(regulators_node)) {
-               debug("%s: %s regulators subnode not found!", __func__,
+               debug("%s: %s regulators subnode not found!\n", __func__,
                      dev->name);
                return -ENXIO;
        }