Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-tegra / xusb-padctl-common.c

diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index abc18c03a5ebb65e7f1fedf028d9c0f58fb5a994..e56e27c8b6ef13ec581b6e997f2c4a83ed6e0760 100644 (file)
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -1,13 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #define pr_fmt(fmt) "tegra-xusb-padctl: " fmt
 
 #include <common.h>
 #include <errno.h>
+#include <log.h>
 
 #include "xusb-padctl-common.h"
 
@@ -84,7 +84,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,
 
        len = ofnode_read_string_count(node, "nvidia,lanes");
        if (len < 0) {
-               error("failed to parse \"nvidia,lanes\" property");
+               pr_err("failed to parse \"nvidia,lanes\" property");
                return -EINVAL;
        }
 
@@ -94,7 +94,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,
                ret = ofnode_read_string_index(node, "nvidia,lanes", i,
                                               &group->pins[i]);
                if (ret) {
-                       error("failed to read string from \"nvidia,lanes\" property");
+                       pr_err("failed to read string from \"nvidia,lanes\" property");
                        return -EINVAL;
                }
        }
@@ -104,7 +104,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,
        ret = ofnode_read_string_index(node, "nvidia,function", 0,
                                       &group->func);
        if (ret) {
-               error("failed to parse \"nvidia,func\" property");
+               pr_err("failed to parse \"nvidia,func\" property");
                return -EINVAL;
        }
 
@@ -157,14 +157,14 @@ tegra_xusb_padctl_group_apply(struct tegra_xusb_padctl *padctl,
 
                lane = tegra_xusb_padctl_find_lane(padctl, group->pins[i]);
                if (!lane) {
-                       error("no lane for pin %s", group->pins[i]);
+                       pr_err("no lane for pin %s", group->pins[i]);
                        continue;
                }
 
                func = tegra_xusb_padctl_lane_find_function(padctl, lane,
                                                            group->func);
                if (func < 0) {
-                       error("function %s invalid for lane %s: %d",
+                       pr_err("function %s invalid for lane %s: %d",
                              group->func, lane->name, func);
                        continue;
                }
@@ -206,7 +206,7 @@ tegra_xusb_padctl_config_apply(struct tegra_xusb_padctl *padctl,
 
                err = tegra_xusb_padctl_group_apply(padctl, group);
                if (err < 0) {
-                       error("failed to apply group %s: %d",
+                       pr_err("failed to apply group %s: %d",
                              group->name, err);
                        continue;
                }
@@ -232,7 +232,7 @@ tegra_xusb_padctl_config_parse_dt(struct tegra_xusb_padctl *padctl,
 
                err = tegra_xusb_padctl_group_parse_dt(padctl, group, subnode);
                if (err < 0) {
-                       error("failed to parse group %s", group->name);
+                       pr_err("failed to parse group %s", group->name);
                        return err;
                }
 
@@ -250,7 +250,7 @@ static int tegra_xusb_padctl_parse_dt(struct tegra_xusb_padctl *padctl,
 
        err = ofnode_read_resource(node, 0, &padctl->regs);
        if (err < 0) {
-               error("registers not found");
+               pr_err("registers not found");
                return err;
        }
 
@@ -261,7 +261,7 @@ static int tegra_xusb_padctl_parse_dt(struct tegra_xusb_padctl *padctl,
                err = tegra_xusb_padctl_config_parse_dt(padctl, config,
                                                        subnode);
                if (err < 0) {
-                       error("failed to parse entry %s: %d",
+                       pr_err("failed to parse entry %s: %d",
                              config->name, err);
                        continue;
                }
@@ -289,7 +289,7 @@ int tegra_xusb_process_nodes(ofnode nodes[], unsigned int count,
 
                err = tegra_xusb_padctl_parse_dt(&padctl, nodes[i]);
                if (err < 0) {
-                       error("failed to parse DT: %d", err);
+                       pr_err("failed to parse DT: %d", err);
                        continue;
                }
 
@@ -298,7 +298,7 @@ int tegra_xusb_process_nodes(ofnode nodes[], unsigned int count,
 
                err = tegra_xusb_padctl_config_apply(&padctl, &padctl.config);
                if (err < 0) {
-                       error("failed to apply pinmux: %d", err);
+                       pr_err("failed to apply pinmux: %d", err);
                        continue;
                }