Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/814561/?format=api
{ "id": 814561, "url": "http://patchwork.ozlabs.org/api/patches/814561/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1505538646-19191-4-git-send-email-yamada.masahiro@socionext.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1505538646-19191-4-git-send-email-yamada.masahiro@socionext.com>", "list_archive_url": null, "date": "2017-09-16T05:10:41", "name": "[U-Boot,v2,3/8] treewide: replace with error() with pr_err()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5e29dae24d0ec65d2ae638bf8bab753ed85d8b77", "submitter": { "id": 65882, "url": "http://patchwork.ozlabs.org/api/people/65882/?format=api", "name": "Masahiro Yamada", "email": "yamada.masahiro@socionext.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1505538646-19191-4-git-send-email-yamada.masahiro@socionext.com/mbox/", "series": [ { "id": 3418, "url": "http://patchwork.ozlabs.org/api/series/3418/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=3418", "date": "2017-09-16T05:10:45", "name": "Sync and consolidate Linux-derived printk, BUILD_BUG, BUG, WARN, etc.", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/3418/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/814561/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/814561/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=nifty.com header.i=@nifty.com\n\theader.b=\"dtax8+rc\"; dkim-atps=neutral" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xvlq03vs0z9t2S\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSun, 17 Sep 2017 07:32:28 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid 58665C21E18; Sat, 16 Sep 2017 21:32:27 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 41A9BC21D63;\n\tSat, 16 Sep 2017 21:31:44 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid AB784C21E10; Sat, 16 Sep 2017 05:12:07 +0000 (UTC)", "from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76])\n\tby lists.denx.de (Postfix) with ESMTPS id 35581C21E10\n\tfor <u-boot@lists.denx.de>; Sat, 16 Sep 2017 05:11:58 +0000 (UTC)", "from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp\n\t[122.131.185.176]) (authenticated)\n\tby conuserg-09.nifty.com with ESMTP id v8G5Ason028761;\n\tSat, 16 Sep 2017 14:10:57 +0900" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.0 required=5.0 tests=T_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0", "DKIM-Filter": "OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v8G5Ason028761", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;\n\ts=dec2015msa; t=1505538658;\n\tbh=+WopS2lb9PMzH9ApDHVMZHIehivGv0TUAou2fXRvguw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dtax8+rcBdCBCIiuXQemZkrAC5oNTRYeWN8464TOiQSRJy5QHJ8uoFG4GVDUVoKjW\n\tusIeHfPAkl73I7nOT47KyKwqhoVS0ceERLgQZpZXFWmgtBFfX/RdX/nleRwsOIfXtz\n\tb/9H6LjHoENhu95OwPUuhBeACQ81Kp7UKZOY40YBdzcxNH5SkogT7ih8Gai4xEXEk+\n\tph6ZAJ0BLQTL3WZTu2zJkjYlfgA+eJR3UI5kuW6PRBD4rMqlukwAS9tsTejCIZfrTW\n\tpDdk+MEB6d3xRBtEa8J2Z+4aVxiN2+IWakSL6LYbuLiC7PPGeRhY8/S4ayG9nbBwB0\n\tqQmjAe5UDO9Jw==", "X-Nifty-SrcIP": "[122.131.185.176]", "From": "Masahiro Yamada <yamada.masahiro@socionext.com>", "To": "u-boot@lists.denx.de", "Date": "Sat, 16 Sep 2017 14:10:41 +0900", "Message-Id": "<1505538646-19191-4-git-send-email-yamada.masahiro@socionext.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1505538646-19191-1-git-send-email-yamada.masahiro@socionext.com>", "References": "<1505538646-19191-1-git-send-email-yamada.masahiro@socionext.com>", "X-Mailman-Approved-At": "Sat, 16 Sep 2017 21:31:43 +0000", "Cc": "Marek Vasut <marex@denx.de>, Albert Aribaud <albert.u.boot@aribaud.net>, \n\tStephen Warren <swarren@nvidia.com>,\n\tJoe Hershberger <joe.hershberger@ni.com>, \n\tRobert Baldyga <r.baldyga@samsung.com>, Scott Wood <oss@buserror.net>,\n\tTom Warren <twarren@nvidia.com>, Jagan Teki <jagan@openedev.com>", "Subject": "[U-Boot] [PATCH v2 3/8] treewide: replace with error() with pr_err()", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "U-Boot widely uses error() as a bit noisier variant of printf().\n\nThis macro causes name conflict with the following line in\ninclude/linux/compiler-gcc.h:\n\n # define __compiletime_error(message) __attribute__((error(message)))\n\nThis prevents us from using __compiletime_error(), and makes it\ndifficult to fully sync BUILD_BUG macros with Linux. (Notice\nLinux's BUILD_BUG_ON_MSG is implemented by using compiletime_assert().)\n\nLet's convert error() into now treewide-available pr_err().\n\nDone with the help of Coccinelle, excluing tools/ directory.\n\nThe semantic patch I used is as follows:\n\n// <smpl>\n@@@@\n-error\n+pr_err\n (...)\n// </smpl>\n\nSigned-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>\n---\n\nChanges in v2: None\n\n arch/arm/mach-omap2/am33xx/board.c | 2 +-\n arch/arm/mach-omap2/utils.c | 4 +-\n arch/arm/mach-rockchip/rk3188-board-spl.c | 2 +-\n arch/arm/mach-rockchip/rk3188-board.c | 2 +-\n arch/arm/mach-rockchip/rk3368-board-spl.c | 4 +-\n arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 2 +-\n arch/arm/mach-socfpga/reset_manager_arria10.c | 2 +-\n arch/arm/mach-tegra/ivc.c | 8 +--\n arch/arm/mach-tegra/tegra124/xusb-padctl.c | 2 +-\n arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 4 +-\n arch/arm/mach-tegra/tegra20/clock.c | 6 +-\n arch/arm/mach-tegra/tegra210/xusb-padctl.c | 2 +-\n arch/arm/mach-tegra/tegra30/clock.c | 6 +-\n arch/arm/mach-tegra/xusb-padctl-common.c | 22 +++----\n arch/x86/cpu/tangier/sdram.c | 6 +-\n board/nvidia/jetson-tk1/jetson-tk1.c | 6 +-\n board/samsung/common/exynos5-dt.c | 2 +-\n board/samsung/common/misc.c | 2 +-\n board/samsung/goni/goni.c | 4 +-\n board/samsung/odroid/odroid.c | 12 ++--\n cmd/fastboot.c | 2 +-\n cmd/nvedit.c | 6 +-\n cmd/regulator.c | 2 +-\n cmd/thordown.c | 6 +-\n cmd/tpm_test.c | 6 +-\n cmd/usb_gadget_sdp.c | 4 +-\n cmd/usb_mass_storage.c | 6 +-\n common/dfu.c | 6 +-\n common/fb_mmc.c | 36 +++++------\n common/fb_nand.c | 12 ++--\n common/spl/spl_dfu.c | 4 +-\n common/spl/spl_sdp.c | 4 +-\n common/update.c | 2 +-\n disk/part_efi.c | 10 +--\n drivers/adc/adc-uclass.c | 6 +-\n drivers/adc/exynos-adc.c | 6 +-\n drivers/adc/sandbox.c | 6 +-\n drivers/ata/dwc_ahci.c | 6 +-\n drivers/clk/clk_boston.c | 4 +-\n drivers/clk/clk_stm32f7.c | 2 +-\n drivers/clk/rockchip/clk_rk3368.c | 8 +--\n drivers/clk/rockchip/clk_rk3399.c | 6 +-\n drivers/clk/rockchip/clk_rv1108.c | 2 +-\n drivers/dfu/dfu.c | 14 ++--\n drivers/dfu/dfu_mmc.c | 18 +++---\n drivers/dfu/dfu_ram.c | 8 +--\n drivers/dfu/dfu_tftp.c | 4 +-\n drivers/dma/dma-uclass.c | 2 +-\n drivers/dma/lpc32xx_dma.c | 8 +--\n drivers/dma/ti-edma3.c | 2 +-\n drivers/i2c/i2c-gpio.c | 2 +-\n drivers/i2c/omap24xx_i2c.c | 2 +-\n drivers/i2c/stm32f7_i2c.c | 16 ++---\n drivers/i2c/tegra_i2c.c | 4 +-\n drivers/misc/tegra186_bpmp.c | 28 ++++----\n drivers/mmc/exynos_dw_mmc.c | 2 +-\n drivers/mmc/hi6220_dw_mmc.c | 2 +-\n drivers/mmc/xenon_sdhci.c | 4 +-\n drivers/mtd/nand/lpc32xx_nand_mlc.c | 6 +-\n drivers/mtd/nand/pxa3xx_nand.c | 2 +-\n drivers/net/bcm-sf2-eth-gmac.c | 14 ++--\n drivers/net/bcm-sf2-eth.c | 18 +++---\n drivers/net/cpsw-common.c | 8 +--\n drivers/net/cpsw.c | 8 +--\n drivers/net/dwc_eth_qos.c | 92 +++++++++++++--------------\n drivers/net/ep93xx_eth.c | 16 ++---\n drivers/net/keystone_net.c | 14 ++--\n drivers/pci/pci_tegra.c | 50 +++++++--------\n drivers/pci/pcie_xilinx.c | 2 +-\n drivers/phy/marvell/comphy_cp110.c | 40 ++++++------\n drivers/phy/ti-pipe3-phy.c | 12 ++--\n drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +-\n drivers/pinctrl/pinctrl-sti.c | 14 ++--\n drivers/pinctrl/pinctrl_stm32.c | 2 +-\n drivers/power/pmic/as3722.c | 12 ++--\n drivers/power/pmic/as3722_gpio.c | 10 +--\n drivers/power/pmic/i2c_pmic_emul.c | 6 +-\n drivers/power/pmic/lp873x.c | 4 +-\n drivers/power/pmic/lp87565.c | 4 +-\n drivers/power/pmic/max77686.c | 4 +-\n drivers/power/pmic/max8997.c | 4 +-\n drivers/power/pmic/max8998.c | 4 +-\n drivers/power/pmic/palmas.c | 4 +-\n drivers/power/pmic/pfuze100.c | 4 +-\n drivers/power/pmic/s2mps11.c | 4 +-\n drivers/power/pmic/s5m8767.c | 4 +-\n drivers/power/pmic/sandbox.c | 6 +-\n drivers/power/pmic/tps65090.c | 4 +-\n drivers/power/regulator/fixed.c | 2 +-\n drivers/power/regulator/gpio-regulator.c | 2 +-\n drivers/power/regulator/max77686.c | 20 +++---\n drivers/power/regulator/sandbox.c | 18 +++---\n drivers/ram/rockchip/dmc-rk3368.c | 14 ++--\n drivers/ram/stm32_sdram.c | 8 +--\n drivers/reset/sti-reset.c | 10 +--\n drivers/spi/atmel_spi.c | 2 +-\n drivers/spi/lpc32xx_ssp.c | 6 +-\n drivers/sysreset/sysreset_sti.c | 6 +-\n drivers/sysreset/sysreset_syscon.c | 4 +-\n drivers/sysreset/sysreset_watchdog.c | 2 +-\n drivers/tpm/tpm_tis_infineon.c | 2 +-\n drivers/usb/common/common.c | 2 +-\n drivers/usb/eth/mcs7830.c | 12 ++--\n drivers/usb/gadget/at91_udc.c | 4 +-\n drivers/usb/gadget/atmel_usba_udc.c | 6 +-\n drivers/usb/gadget/dwc2_udc_otg.c | 2 +-\n drivers/usb/gadget/ether.c | 42 ++++++------\n drivers/usb/gadget/f_fastboot.c | 10 +--\n drivers/usb/gadget/f_sdp.c | 16 ++---\n drivers/usb/gadget/f_thor.c | 26 ++++----\n drivers/usb/host/dwc2.c | 2 +-\n drivers/usb/host/ehci-generic.c | 18 +++---\n drivers/usb/host/ohci-generic.c | 18 +++---\n drivers/usb/host/xhci-dwc3.c | 6 +-\n drivers/usb/host/xhci-rockchip.c | 12 ++--\n drivers/usb/musb-new/ti-musb.c | 12 ++--\n drivers/video/am335x-fb.c | 2 +-\n env/common.c | 8 +--\n env/sf.c | 2 +-\n fs/jffs2/jffs2_nand_1pass.c | 2 +-\n fs/yaffs2/yaffs_uboot_glue.c | 2 +-\n 121 files changed, 521 insertions(+), 521 deletions(-)", "diff": "diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c\nindex 913a44ad64b4..ae86b69b9c71 100644\n--- a/arch/arm/mach-omap2/am33xx/board.c\n+++ b/arch/arm/mach-omap2/am33xx/board.c\n@@ -241,7 +241,7 @@ int arch_misc_init(void)\n #if defined(CONFIG_DM_ETH) && defined(CONFIG_USB_ETHER)\n \tret = usb_ether_init();\n \tif (ret) {\n-\t\terror(\"USB ether init failed\\n\");\n+\t\tpr_err(\"USB ether init failed\\n\");\n \t\treturn ret;\n \t}\n #endif\ndiff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c\nindex 0b0bf1837c9c..f2fafae2a160 100644\n--- a/arch/arm/mach-omap2/utils.c\n+++ b/arch/arm/mach-omap2/utils.c\n@@ -87,13 +87,13 @@ static u32 omap_mmc_get_part_size(const char *part)\n \n \tdev_desc = blk_get_dev(\"mmc\", CONFIG_FASTBOOT_FLASH_MMC_DEV);\n \tif (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {\n-\t\terror(\"invalid mmc device\\n\");\n+\t\tpr_err(\"invalid mmc device\\n\");\n \t\treturn 0;\n \t}\n \n \tres = part_get_info_by_name(dev_desc, part, &info);\n \tif (res < 0) {\n-\t\terror(\"cannot find partition: '%s'\\n\", part);\n+\t\tpr_err(\"cannot find partition: '%s'\\n\", part);\n \t\treturn 0;\n \t}\n \ndiff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c\nindex d3866bf029a5..406207ed21ce 100644\n--- a/arch/arm/mach-rockchip/rk3188-board-spl.c\n+++ b/arch/arm/mach-rockchip/rk3188-board-spl.c\n@@ -151,7 +151,7 @@ void board_init_f(ulong dummy)\n \t */\n \tpmu = syscon_get_first_range(ROCKCHIP_SYSCON_PMU);\n \tif (IS_ERR(pmu))\n-\t\terror(\"pmu syscon returned %ld\\n\", PTR_ERR(pmu));\n+\t\tpr_err(\"pmu syscon returned %ld\\n\", PTR_ERR(pmu));\n \tSAVE_SP_ADDR = readl(&pmu->sys_reg[2]);\n \n \tret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);\ndiff --git a/arch/arm/mach-rockchip/rk3188-board.c b/arch/arm/mach-rockchip/rk3188-board.c\nindex 622e046dc0a7..96859a5b4bc7 100644\n--- a/arch/arm/mach-rockchip/rk3188-board.c\n+++ b/arch/arm/mach-rockchip/rk3188-board.c\n@@ -26,7 +26,7 @@ int board_late_init(void)\n \n \tgrf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);\n \tif (IS_ERR(grf)) {\n-\t\terror(\"grf syscon returned %ld\\n\", PTR_ERR(grf));\n+\t\tpr_err(\"grf syscon returned %ld\\n\", PTR_ERR(grf));\n \t} else {\n \t\t/* enable noc remap to mimic legacy loaders */\n \t\trk_clrsetreg(&grf->soc_con0,\ndiff --git a/arch/arm/mach-rockchip/rk3368-board-spl.c b/arch/arm/mach-rockchip/rk3368-board-spl.c\nindex cabf34448643..72d2c97d3636 100644\n--- a/arch/arm/mach-rockchip/rk3368-board-spl.c\n+++ b/arch/arm/mach-rockchip/rk3368-board-spl.c\n@@ -38,13 +38,13 @@ void board_init_f(ulong dummy)\n \t/* Set up our preloader console */\n \tret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);\n \tif (ret) {\n-\t\terror(\"%s: pinctrl init failed: %d\\n\", __func__, ret);\n+\t\tpr_err(\"%s: pinctrl init failed: %d\\n\", __func__, ret);\n \t\thang();\n \t}\n \n \tret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART0);\n \tif (ret) {\n-\t\terror(\"%s: failed to set up console UART\\n\", __func__);\n+\t\tpr_err(\"%s: failed to set up console UART\\n\", __func__);\n \t\thang();\n \t}\n \ndiff --git a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c\nindex 63342ab5c98a..1a441703a085 100644\n--- a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c\n+++ b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c\n@@ -551,7 +551,7 @@ static int pctl_cfg(const struct chan_info *chan, u32 channel,\n \ttmp = get_timer(0);\n \tdo {\n \t\tif (get_timer(tmp) > timeout_ms) {\n-\t\t\terror(\"DRAM (%s): phy failed to lock within %ld ms\\n\",\n+\t\t\tpr_err(\"DRAM (%s): phy failed to lock within %ld ms\\n\",\n \t\t\t __func__, timeout_ms);\n \t\t\treturn -ETIME;\n \t\t}\ndiff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c\nindex 66f1ec21f132..ae16897494bd 100644\n--- a/arch/arm/mach-socfpga/reset_manager_arria10.c\n+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c\n@@ -174,7 +174,7 @@ void socfpga_emac_manage_reset(ulong emacbase, u32 state)\n \t\temacmask = ALT_RSTMGR_PER0MODRST_EMAC2_SET_MSK;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"emac base address unexpected! %lx\", emacbase);\n+\t\tpr_err(\"emac base address unexpected! %lx\", emacbase);\n \t\thang();\n \t\tbreak;\n \t}\ndiff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c\nindex cf6626fb12c7..dec7d90c5d3b 100644\n--- a/arch/arm/mach-tegra/ivc.c\n+++ b/arch/arm/mach-tegra/ivc.c\n@@ -493,7 +493,7 @@ static int check_ivc_params(ulong qbase1, ulong qbase2, uint32_t nframes,\n \t (TEGRA_IVC_ALIGN - 1));\n \n \tif ((uint64_t)nframes * (uint64_t)frame_size >= 0x100000000) {\n-\t\terror(\"tegra_ivc: nframes * frame_size overflows\\n\");\n+\t\tpr_err(\"tegra_ivc: nframes * frame_size overflows\\n\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -503,12 +503,12 @@ static int check_ivc_params(ulong qbase1, ulong qbase2, uint32_t nframes,\n \t */\n \tif ((qbase1 & (TEGRA_IVC_ALIGN - 1)) ||\n \t (qbase2 & (TEGRA_IVC_ALIGN - 1))) {\n-\t\terror(\"tegra_ivc: channel start not aligned\\n\");\n+\t\tpr_err(\"tegra_ivc: channel start not aligned\\n\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (frame_size & (TEGRA_IVC_ALIGN - 1)) {\n-\t\terror(\"tegra_ivc: frame size not adequately aligned\\n\");\n+\t\tpr_err(\"tegra_ivc: frame size not adequately aligned\\n\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -521,7 +521,7 @@ static int check_ivc_params(ulong qbase1, ulong qbase2, uint32_t nframes,\n \t}\n \n \tif (ret) {\n-\t\terror(\"tegra_ivc: queue regions overlap\\n\");\n+\t\tpr_err(\"tegra_ivc: queue regions overlap\\n\");\n \t\treturn ret;\n \t}\n \ndiff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c\nindex d326a6ae5701..bfc0ab8f102a 100644\n--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c\n+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c\n@@ -137,7 +137,7 @@ static int tegra_xusb_padctl_disable(struct tegra_xusb_padctl *padctl)\n \tu32 value;\n \n \tif (padctl->enable == 0) {\n-\t\terror(\"unbalanced enable/disable\");\n+\t\tpr_err(\"unbalanced enable/disable\");\n \t\treturn 0;\n \t}\n \ndiff --git a/arch/arm/mach-tegra/tegra186/nvtboot_mem.c b/arch/arm/mach-tegra/tegra186/nvtboot_mem.c\nindex 966cf9f1c460..5224ef641cd8 100644\n--- a/arch/arm/mach-tegra/tegra186/nvtboot_mem.c\n+++ b/arch/arm/mach-tegra/tegra186/nvtboot_mem.c\n@@ -45,12 +45,12 @@ int dram_init(void)\n \n \tnode = fdt_path_offset(nvtboot_blob, \"/memory\");\n \tif (node < 0) {\n-\t\terror(\"Can't find /memory node in nvtboot DTB\");\n+\t\tpr_err(\"Can't find /memory node in nvtboot DTB\");\n \t\thang();\n \t}\n \tprop = fdt_getprop(nvtboot_blob, node, \"reg\", &len);\n \tif (!prop) {\n-\t\terror(\"Can't find /memory/reg property in nvtboot DTB\");\n+\t\tpr_err(\"Can't find /memory/reg property in nvtboot DTB\");\n \t\thang();\n \t}\n \ndiff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c\nindex ec04cf5261f7..81fb1d840f28 100644\n--- a/arch/arm/mach-tegra/tegra20/clock.c\n+++ b/arch/arm/mach-tegra/tegra20/clock.c\n@@ -667,7 +667,7 @@ static int tegra_plle_train(void)\n \t} while (--timeout);\n \n \tif (timeout == 0) {\n-\t\terror(\"timeout waiting for PLLE to become ready\");\n+\t\tpr_err(\"timeout waiting for PLLE to become ready\");\n \t\treturn -ETIMEDOUT;\n \t}\n \n@@ -697,7 +697,7 @@ int tegra_plle_enable(void)\n \tif ((value & PLLE_MISC_PLL_READY) == 0) {\n \t\terr = tegra_plle_train();\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to train PLLE: %d\", err);\n+\t\t\tpr_err(\"failed to train PLLE: %d\", err);\n \t\t\treturn err;\n \t\t}\n \t}\n@@ -726,7 +726,7 @@ int tegra_plle_enable(void)\n \t} while (--timeout);\n \n \tif (timeout == 0) {\n-\t\terror(\"timeout waiting for PLLE to lock\");\n+\t\tpr_err(\"timeout waiting for PLLE to lock\");\n \t\treturn -ETIMEDOUT;\n \t}\n \ndiff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c\nindex bf85e075de2f..a3e3e378e180 100644\n--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c\n+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c\n@@ -125,7 +125,7 @@ static int tegra_xusb_padctl_disable(struct tegra_xusb_padctl *padctl)\n \tu32 value;\n \n \tif (padctl->enable == 0) {\n-\t\terror(\"unbalanced enable/disable\");\n+\t\tpr_err(\"unbalanced enable/disable\");\n \t\treturn 0;\n \t}\n \ndiff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c\nindex 4fd8b8a3b1fb..282f34fb8947 100644\n--- a/arch/arm/mach-tegra/tegra30/clock.c\n+++ b/arch/arm/mach-tegra/tegra30/clock.c\n@@ -696,7 +696,7 @@ static int tegra_plle_train(void)\n \t} while (--timeout);\n \n \tif (timeout == 0) {\n-\t\terror(\"timeout waiting for PLLE to become ready\");\n+\t\tpr_err(\"timeout waiting for PLLE to become ready\");\n \t\treturn -ETIMEDOUT;\n \t}\n \n@@ -726,7 +726,7 @@ int tegra_plle_enable(void)\n \tif ((value & PLLE_MISC_PLL_READY) == 0) {\n \t\terr = tegra_plle_train();\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to train PLLE: %d\", err);\n+\t\t\tpr_err(\"failed to train PLLE: %d\", err);\n \t\t\treturn err;\n \t\t}\n \t}\n@@ -772,7 +772,7 @@ int tegra_plle_enable(void)\n \t} while (--timeout);\n \n \tif (timeout == 0) {\n-\t\terror(\"timeout waiting for PLLE to lock\");\n+\t\tpr_err(\"timeout waiting for PLLE to lock\");\n \t\treturn -ETIMEDOUT;\n \t}\n \ndiff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c\nindex abc18c03a5eb..c8a468a034c3 100644\n--- a/arch/arm/mach-tegra/xusb-padctl-common.c\n+++ b/arch/arm/mach-tegra/xusb-padctl-common.c\n@@ -84,7 +84,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,\n \n \tlen = ofnode_read_string_count(node, \"nvidia,lanes\");\n \tif (len < 0) {\n-\t\terror(\"failed to parse \\\"nvidia,lanes\\\" property\");\n+\t\tpr_err(\"failed to parse \\\"nvidia,lanes\\\" property\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -94,7 +94,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,\n \t\tret = ofnode_read_string_index(node, \"nvidia,lanes\", i,\n \t\t\t\t\t &group->pins[i]);\n \t\tif (ret) {\n-\t\t\terror(\"failed to read string from \\\"nvidia,lanes\\\" property\");\n+\t\t\tpr_err(\"failed to read string from \\\"nvidia,lanes\\\" property\");\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -104,7 +104,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,\n \tret = ofnode_read_string_index(node, \"nvidia,function\", 0,\n \t\t\t\t &group->func);\n \tif (ret) {\n-\t\terror(\"failed to parse \\\"nvidia,func\\\" property\");\n+\t\tpr_err(\"failed to parse \\\"nvidia,func\\\" property\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -157,14 +157,14 @@ tegra_xusb_padctl_group_apply(struct tegra_xusb_padctl *padctl,\n \n \t\tlane = tegra_xusb_padctl_find_lane(padctl, group->pins[i]);\n \t\tif (!lane) {\n-\t\t\terror(\"no lane for pin %s\", group->pins[i]);\n+\t\t\tpr_err(\"no lane for pin %s\", group->pins[i]);\n \t\t\tcontinue;\n \t\t}\n \n \t\tfunc = tegra_xusb_padctl_lane_find_function(padctl, lane,\n \t\t\t\t\t\t\t group->func);\n \t\tif (func < 0) {\n-\t\t\terror(\"function %s invalid for lane %s: %d\",\n+\t\t\tpr_err(\"function %s invalid for lane %s: %d\",\n \t\t\t group->func, lane->name, func);\n \t\t\tcontinue;\n \t\t}\n@@ -206,7 +206,7 @@ tegra_xusb_padctl_config_apply(struct tegra_xusb_padctl *padctl,\n \n \t\terr = tegra_xusb_padctl_group_apply(padctl, group);\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to apply group %s: %d\",\n+\t\t\tpr_err(\"failed to apply group %s: %d\",\n \t\t\t group->name, err);\n \t\t\tcontinue;\n \t\t}\n@@ -232,7 +232,7 @@ tegra_xusb_padctl_config_parse_dt(struct tegra_xusb_padctl *padctl,\n \n \t\terr = tegra_xusb_padctl_group_parse_dt(padctl, group, subnode);\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to parse group %s\", group->name);\n+\t\t\tpr_err(\"failed to parse group %s\", group->name);\n \t\t\treturn err;\n \t\t}\n \n@@ -250,7 +250,7 @@ static int tegra_xusb_padctl_parse_dt(struct tegra_xusb_padctl *padctl,\n \n \terr = ofnode_read_resource(node, 0, &padctl->regs);\n \tif (err < 0) {\n-\t\terror(\"registers not found\");\n+\t\tpr_err(\"registers not found\");\n \t\treturn err;\n \t}\n \n@@ -261,7 +261,7 @@ static int tegra_xusb_padctl_parse_dt(struct tegra_xusb_padctl *padctl,\n \t\terr = tegra_xusb_padctl_config_parse_dt(padctl, config,\n \t\t\t\t\t\t\tsubnode);\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to parse entry %s: %d\",\n+\t\t\tpr_err(\"failed to parse entry %s: %d\",\n \t\t\t config->name, err);\n \t\t\tcontinue;\n \t\t}\n@@ -289,7 +289,7 @@ int tegra_xusb_process_nodes(ofnode nodes[], unsigned int count,\n \n \t\terr = tegra_xusb_padctl_parse_dt(&padctl, nodes[i]);\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to parse DT: %d\", err);\n+\t\t\tpr_err(\"failed to parse DT: %d\", err);\n \t\t\tcontinue;\n \t\t}\n \n@@ -298,7 +298,7 @@ int tegra_xusb_process_nodes(ofnode nodes[], unsigned int count,\n \n \t\terr = tegra_xusb_padctl_config_apply(&padctl, &padctl.config);\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to apply pinmux: %d\", err);\n+\t\t\tpr_err(\"failed to apply pinmux: %d\", err);\n \t\t\tcontinue;\n \t\t}\n \ndiff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c\nindex 5743077431d3..eae8d785df9e 100644\n--- a/arch/x86/cpu/tangier/sdram.c\n+++ b/arch/x86/cpu/tangier/sdram.c\n@@ -39,7 +39,7 @@ static int sfi_table_check(struct sfi_table_header *sbh)\n \t\tchksum += *pos++;\n \n \tif (chksum)\n-\t\terror(\"sfi: Invalid checksum\\n\");\n+\t\tpr_err(\"sfi: Invalid checksum\\n\");\n \n \t/* Checksum is OK if zero */\n \treturn chksum ? -EILSEQ : 0;\n@@ -76,7 +76,7 @@ static struct sfi_table_simple *sfi_search_mmap(void)\n \t/* Find SYST table */\n \tsb = sfi_get_table_by_sig(SFI_BASE_ADDR, SFI_SIG_SYST);\n \tif (!sb) {\n-\t\terror(\"sfi: failed to locate SYST table\\n\");\n+\t\tpr_err(\"sfi: failed to locate SYST table\\n\");\n \t\treturn NULL;\n \t}\n \n@@ -90,7 +90,7 @@ static struct sfi_table_simple *sfi_search_mmap(void)\n \t\t\treturn (struct sfi_table_simple *)sbh;\n \t}\n \n-\terror(\"sfi: failed to locate SFI MMAP table\\n\");\n+\tpr_err(\"sfi: failed to locate SFI MMAP table\\n\");\n \treturn NULL;\n }\n \ndiff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c\nindex bd08a2eed425..c20da29a98ad 100644\n--- a/board/nvidia/jetson-tk1/jetson-tk1.c\n+++ b/board/nvidia/jetson-tk1/jetson-tk1.c\n@@ -49,7 +49,7 @@ static int as3722_sd_enable(struct udevice *pmic, unsigned int sd)\n \n \terr = pmic_clrsetbits(pmic, AS3722_SD_CONTROL, 0, 1 << sd);\n \tif (err) {\n-\t\terror(\"failed to update SD control register: %d\", err);\n+\t\tpr_err(\"failed to update SD control register: %d\", err);\n \t\treturn err;\n \t}\n \n@@ -70,13 +70,13 @@ int tegra_pcie_board_init(void)\n \n \tret = as3722_sd_enable(dev, 4);\n \tif (ret < 0) {\n-\t\terror(\"failed to enable SD4: %d\\n\", ret);\n+\t\tpr_err(\"failed to enable SD4: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \tret = as3722_sd_set_voltage(dev, 4, 0x24);\n \tif (ret < 0) {\n-\t\terror(\"failed to set SD4 voltage: %d\\n\", ret);\n+\t\tpr_err(\"failed to set SD4 voltage: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \ndiff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c\nindex ae2a6e6bfa63..0d17f30712cd 100644\n--- a/board/samsung/common/exynos5-dt.c\n+++ b/board/samsung/common/exynos5-dt.c\n@@ -161,7 +161,7 @@ int board_usb_init(int index, enum usb_init_type init)\n \t\tsamsung_get_base_usb3_phy();\n \n \tif (!phy) {\n-\t\terror(\"usb3 phy not supported\");\n+\t\tpr_err(\"usb3 phy not supported\");\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c\nindex 4157349d028b..eba25b7b980a 100644\n--- a/board/samsung/common/misc.c\n+++ b/board/samsung/common/misc.c\n@@ -457,7 +457,7 @@ void draw_logo(void)\n \n \taddr = panel_info.logo_addr;\n \tif (!addr) {\n-\t\terror(\"There is no logo data.\");\n+\t\tpr_err(\"There is no logo data.\");\n \t\treturn;\n \t}\n \ndiff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c\nindex d0247ac2571a..debc4c57ffa0 100644\n--- a/board/samsung/goni/goni.c\n+++ b/board/samsung/goni/goni.c\n@@ -102,7 +102,7 @@ int board_mmc_init(bd_t *bis)\n \n \tret = s5p_mmc_init(0, 4);\n \tif (ret)\n-\t\terror(\"MMC: Failed to init MMC:0.\\n\");\n+\t\tpr_err(\"MMC: Failed to init MMC:0.\\n\");\n \n \t/*\n \t * SD card (T_FLASH) detect and init\n@@ -127,7 +127,7 @@ int board_mmc_init(bd_t *bis)\n \n \t\tret_sd = s5p_mmc_init(2, 4);\n \t\tif (ret_sd)\n-\t\t\terror(\"MMC: Failed to init SD card (MMC:2).\\n\");\n+\t\t\tpr_err(\"MMC: Failed to init SD card (MMC:2).\\n\");\n \t}\n \n \treturn ret & ret_sd;\ndiff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c\nindex e40a2f6e3a69..0df96c1a3daf 100644\n--- a/board/samsung/odroid/odroid.c\n+++ b/board/samsung/odroid/odroid.c\n@@ -429,7 +429,7 @@ int exynos_power_init(void)\n \t};\n \n \tif (regulator_list_autoset(mmc_regulators, NULL, true))\n-\t\terror(\"Unable to init all mmc regulators\");\n+\t\tpr_err(\"Unable to init all mmc regulators\");\n \n \treturn 0;\n }\n@@ -442,7 +442,7 @@ static int s5pc210_phy_control(int on)\n \n \tret = regulator_get_by_platname(\"VDD_UOTG_3.0V\", &dev);\n \tif (ret) {\n-\t\terror(\"Regulator get error: %d\", ret);\n+\t\tpr_err(\"Regulator get error: %d\", ret);\n \t\treturn ret;\n \t}\n \n@@ -487,25 +487,25 @@ int board_usb_init(int index, enum usb_init_type init)\n \n \tret = regulator_get_by_platname(\"VCC_P3V3_2.85V\", &dev);\n \tif (ret) {\n-\t\terror(\"Regulator get error: %d\", ret);\n+\t\tpr_err(\"Regulator get error: %d\", ret);\n \t\treturn ret;\n \t}\n \n \tret = regulator_set_enable(dev, true);\n \tif (ret) {\n-\t\terror(\"Regulator %s enable setting error: %d\", dev->name, ret);\n+\t\tpr_err(\"Regulator %s enable setting error: %d\", dev->name, ret);\n \t\treturn ret;\n \t}\n \n \tret = regulator_set_value(dev, 750000);\n \tif (ret) {\n-\t\terror(\"Regulator %s value setting error: %d\", dev->name, ret);\n+\t\tpr_err(\"Regulator %s value setting error: %d\", dev->name, ret);\n \t\treturn ret;\n \t}\n \n \tret = regulator_set_value(dev, 3300000);\n \tif (ret) {\n-\t\terror(\"Regulator %s value setting error: %d\", dev->name, ret);\n+\t\tpr_err(\"Regulator %s value setting error: %d\", dev->name, ret);\n \t\treturn ret;\n \t}\n #endif\ndiff --git a/cmd/fastboot.c b/cmd/fastboot.c\nindex 488822a2eed5..8adcca592d58 100644\n--- a/cmd/fastboot.c\n+++ b/cmd/fastboot.c\n@@ -27,7 +27,7 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])\n \n \tret = board_usb_init(controller_index, USB_INIT_DEVICE);\n \tif (ret) {\n-\t\terror(\"USB init failed: %d\", ret);\n+\t\tpr_err(\"USB init failed: %d\", ret);\n \t\treturn CMD_RET_FAILURE;\n \t}\n \ndiff --git a/cmd/nvedit.c b/cmd/nvedit.c\nindex 4033d90c8e2d..228e904e1d51 100644\n--- a/cmd/nvedit.c\n+++ b/cmd/nvedit.c\n@@ -927,7 +927,7 @@ NXTARG:\t\t;\n \t\t\t\tH_MATCH_KEY | H_MATCH_IDENT,\n \t\t\t\t&ptr, size, argc, argv);\n \t\tif (len < 0) {\n-\t\t\terror(\"Cannot export environment: errno = %d\\n\", errno);\n+\t\t\tpr_err(\"Cannot export environment: errno = %d\\n\", errno);\n \t\t\treturn 1;\n \t\t}\n \t\tsprintf(buf, \"%zX\", (size_t)len);\n@@ -947,7 +947,7 @@ NXTARG:\t\t;\n \t\t\tH_MATCH_KEY | H_MATCH_IDENT,\n \t\t\t&res, ENV_SIZE, argc, argv);\n \tif (len < 0) {\n-\t\terror(\"Cannot export environment: errno = %d\\n\", errno);\n+\t\tpr_err(\"Cannot export environment: errno = %d\\n\", errno);\n \t\treturn 1;\n \t}\n \n@@ -1082,7 +1082,7 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag,\n \n \tif (himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR,\n \t\t\tcrlf_is_lf, 0, NULL) == 0) {\n-\t\terror(\"Environment import failed: errno = %d\\n\", errno);\n+\t\tpr_err(\"Environment import failed: errno = %d\\n\", errno);\n \t\treturn 1;\n \t}\n \tgd->flags |= GD_FLG_ENV_READY;\ndiff --git a/cmd/regulator.c b/cmd/regulator.c\nindex 2ef5bc9a8289..b605255180d5 100644\n--- a/cmd/regulator.c\n+++ b/cmd/regulator.c\n@@ -71,7 +71,7 @@ static int curr_dev_and_platdata(struct udevice **devp,\n \n \t*uc_pdata = dev_get_uclass_platdata(*devp);\n \tif (!*uc_pdata) {\n-\t\terror(\"Regulator: %s - missing platform data!\", currdev->name);\n+\t\tpr_err(\"Regulator: %s - missing platform data!\", currdev->name);\n \t\treturn CMD_RET_FAILURE;\n \t}\n \ndiff --git a/cmd/thordown.c b/cmd/thordown.c\nindex 436b7f56315e..1bb5fc2ec23b 100644\n--- a/cmd/thordown.c\n+++ b/cmd/thordown.c\n@@ -33,7 +33,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n \tint controller_index = simple_strtoul(usb_controller, NULL, 0);\n \tret = board_usb_init(controller_index, USB_INIT_DEVICE);\n \tif (ret) {\n-\t\terror(\"USB init failed: %d\", ret);\n+\t\tpr_err(\"USB init failed: %d\", ret);\n \t\tret = CMD_RET_FAILURE;\n \t\tgoto exit;\n \t}\n@@ -42,14 +42,14 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n \n \tret = thor_init();\n \tif (ret) {\n-\t\terror(\"THOR DOWNLOAD failed: %d\", ret);\n+\t\tpr_err(\"THOR DOWNLOAD failed: %d\", ret);\n \t\tret = CMD_RET_FAILURE;\n \t\tgoto exit;\n \t}\n \n \tret = thor_handle();\n \tif (ret) {\n-\t\terror(\"THOR failed: %d\", ret);\n+\t\tpr_err(\"THOR failed: %d\", ret);\n \t\tret = CMD_RET_FAILURE;\n \t\tgoto exit;\n \t}\ndiff --git a/cmd/tpm_test.c b/cmd/tpm_test.c\nindex 330640594879..37ad2ff33d65 100644\n--- a/cmd/tpm_test.c\n+++ b/cmd/tpm_test.c\n@@ -303,12 +303,12 @@ static int test_readonly(void)\n \tindex_0 += 1;\n \tif (tpm_nv_write_value(INDEX0, (uint8_t *)&index_0, sizeof(index_0) !=\n \t\tTPM_SUCCESS)) {\n-\t\terror(\"\\tcould not write index 0\\n\");\n+\t\tpr_err(\"\\tcould not write index 0\\n\");\n \t}\n \ttpm_nv_write_value_lock(INDEX0);\n \tif (tpm_nv_write_value(INDEX0, (uint8_t *)&index_0, sizeof(index_0)) ==\n \t\t\tTPM_SUCCESS)\n-\t\terror(\"\\tindex 0 is not locked\\n\");\n+\t\tpr_err(\"\\tindex 0 is not locked\\n\");\n \n \tprintf(\"\\tdone\\n\");\n \treturn 0;\n@@ -471,7 +471,7 @@ static int test_write_limit(void)\n \t\tcase TPM_MAXNVWRITES:\n \t\t\tassert(i >= TPM_MAX_NV_WRITES_NOOWNER);\n \t\tdefault:\n-\t\t\terror(\"\\tunexpected error code %d (0x%x)\\n\",\n+\t\t\tpr_err(\"\\tunexpected error code %d (0x%x)\\n\",\n \t\t\t result, result);\n \t\t}\n \t}\ndiff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c\nindex b1d8b2858e19..ae4d73c1250d 100644\n--- a/cmd/usb_gadget_sdp.c\n+++ b/cmd/usb_gadget_sdp.c\n@@ -28,13 +28,13 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n \n \tret = sdp_init(controller_index);\n \tif (ret) {\n-\t\terror(\"SDP init failed: %d\", ret);\n+\t\tpr_err(\"SDP init failed: %d\", ret);\n \t\tgoto exit;\n \t}\n \n \t/* This command typically does not return but jumps to an image */\n \tsdp_handle(controller_index);\n-\terror(\"SDP ended\");\n+\tpr_err(\"SDP ended\");\n \n exit:\n \tg_dnl_unregister();\ndiff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c\nindex 3353f95c7450..cfeecb7068a6 100644\n--- a/cmd/usb_mass_storage.c\n+++ b/cmd/usb_mass_storage.c\n@@ -162,21 +162,21 @@ static int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,\n \tcontroller_index = (unsigned int)(simple_strtoul(\n \t\t\t\tusb_controller,\tNULL, 0));\n \tif (board_usb_init(controller_index, USB_INIT_DEVICE)) {\n-\t\terror(\"Couldn't init USB controller.\");\n+\t\tpr_err(\"Couldn't init USB controller.\");\n \t\trc = CMD_RET_FAILURE;\n \t\tgoto cleanup_ums_init;\n \t}\n \n \trc = fsg_init(ums, ums_count);\n \tif (rc) {\n-\t\terror(\"fsg_init failed\");\n+\t\tpr_err(\"fsg_init failed\");\n \t\trc = CMD_RET_FAILURE;\n \t\tgoto cleanup_board;\n \t}\n \n \trc = g_dnl_register(\"usb_dnl_ums\");\n \tif (rc) {\n-\t\terror(\"g_dnl_register failed\");\n+\t\tpr_err(\"g_dnl_register failed\");\n \t\trc = CMD_RET_FAILURE;\n \t\tgoto cleanup_board;\n \t}\ndiff --git a/common/dfu.c b/common/dfu.c\nindex 546a1ab9b4c0..07dff317a6c2 100644\n--- a/common/dfu.c\n+++ b/common/dfu.c\n@@ -26,13 +26,13 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)\n \n \tret = board_usb_init(usbctrl_index, USB_INIT_DEVICE);\n \tif (ret) {\n-\t\terror(\"board usb init failed\\n\");\n+\t\tpr_err(\"board usb init failed\\n\");\n \t\treturn CMD_RET_FAILURE;\n \t}\n \tg_dnl_clear_detach();\n \tret = g_dnl_register(usb_dnl_gadget);\n \tif (ret) {\n-\t\terror(\"g_dnl_register failed\");\n+\t\tpr_err(\"g_dnl_register failed\");\n \t\treturn CMD_RET_FAILURE;\n \t}\n \n@@ -75,7 +75,7 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)\n \t\t\tret = dfu_flush(dfu_get_defer_flush(), NULL, 0, 0);\n \t\t\tdfu_set_defer_flush(NULL);\n \t\t\tif (ret) {\n-\t\t\t\terror(\"Deferred dfu_flush() failed!\");\n+\t\t\t\tpr_err(\"Deferred dfu_flush() failed!\");\n \t\t\t\tgoto exit;\n \t\t\t}\n \t\t}\ndiff --git a/common/fb_mmc.c b/common/fb_mmc.c\nindex 26d60b88d0ca..cf5b77ca287e 100644\n--- a/common/fb_mmc.c\n+++ b/common/fb_mmc.c\n@@ -84,7 +84,7 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,\n \tblkcnt = lldiv(blkcnt, info->blksz);\n \n \tif (blkcnt > info->size) {\n-\t\terror(\"too large for partition: '%s'\\n\", part_name);\n+\t\tpr_err(\"too large for partition: '%s'\\n\", part_name);\n \t\tfastboot_fail(\"too large for partition\");\n \t\treturn;\n \t}\n@@ -93,7 +93,7 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,\n \n \tblks = blk_dwrite(dev_desc, info->start, blkcnt, buffer);\n \tif (blks != blkcnt) {\n-\t\terror(\"failed writing to device %d\\n\", dev_desc->devnum);\n+\t\tpr_err(\"failed writing to device %d\\n\", dev_desc->devnum);\n \t\tfastboot_fail(\"failed writing to device\");\n \t\treturn;\n \t}\n@@ -125,7 +125,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,\n \tsector_size = info->blksz;\n \thdr_sectors = DIV_ROUND_UP(sizeof(struct andr_img_hdr), sector_size);\n \tif (hdr_sectors == 0) {\n-\t\terror(\"invalid number of boot sectors: 0\");\n+\t\tpr_err(\"invalid number of boot sectors: 0\");\n \t\tfastboot_fail(\"invalid number of boot sectors: 0\");\n \t\treturn 0;\n \t}\n@@ -133,7 +133,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,\n \t/* Read the boot image header */\n \tres = blk_dread(dev_desc, info->start, hdr_sectors, (void *)hdr);\n \tif (res != hdr_sectors) {\n-\t\terror(\"cannot read header from boot partition\");\n+\t\tpr_err(\"cannot read header from boot partition\");\n \t\tfastboot_fail(\"cannot read header from boot partition\");\n \t\treturn 0;\n \t}\n@@ -141,7 +141,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,\n \t/* Check boot header magic string */\n \tres = android_image_check_header(hdr);\n \tif (res != 0) {\n-\t\terror(\"bad boot image magic\");\n+\t\tpr_err(\"bad boot image magic\");\n \t\tfastboot_fail(\"boot partition not initialized\");\n \t\treturn 0;\n \t}\n@@ -179,7 +179,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,\n \t/* Get boot partition info */\n \tres = part_get_info_by_name(dev_desc, BOOT_PARTITION_NAME, &info);\n \tif (res < 0) {\n-\t\terror(\"cannot find boot partition\");\n+\t\tpr_err(\"cannot find boot partition\");\n \t\tfastboot_fail(\"cannot find boot partition\");\n \t\treturn -1;\n \t}\n@@ -191,14 +191,14 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,\n \t/* Read boot image header */\n \thdr_sectors = fb_mmc_get_boot_header(dev_desc, &info, hdr);\n \tif (hdr_sectors == 0) {\n-\t\terror(\"unable to read boot image header\");\n+\t\tpr_err(\"unable to read boot image header\");\n \t\tfastboot_fail(\"unable to read boot image header\");\n \t\treturn -1;\n \t}\n \n \t/* Check if boot image has second stage in it (we don't support it) */\n \tif (hdr->second_size > 0) {\n-\t\terror(\"moving second stage is not supported yet\");\n+\t\tpr_err(\"moving second stage is not supported yet\");\n \t\tfastboot_fail(\"moving second stage is not supported yet\");\n \t\treturn -1;\n \t}\n@@ -216,7 +216,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,\n \tres = blk_dread(dev_desc, ramdisk_sector_start, ramdisk_sectors,\n \t\t\tramdisk_buffer);\n \tif (res != ramdisk_sectors) {\n-\t\terror(\"cannot read ramdisk from boot partition\");\n+\t\tpr_err(\"cannot read ramdisk from boot partition\");\n \t\tfastboot_fail(\"cannot read ramdisk from boot partition\");\n \t\treturn -1;\n \t}\n@@ -225,7 +225,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,\n \thdr->kernel_size = download_bytes;\n \tres = blk_dwrite(dev_desc, info.start, hdr_sectors, (void *)hdr);\n \tif (res == 0) {\n-\t\terror(\"cannot writeback boot image header\");\n+\t\tpr_err(\"cannot writeback boot image header\");\n \t\tfastboot_fail(\"cannot write back boot image header\");\n \t\treturn -1;\n \t}\n@@ -237,7 +237,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,\n \tres = blk_dwrite(dev_desc, kernel_sector_start, kernel_sectors,\n \t\t\t download_buffer);\n \tif (res == 0) {\n-\t\terror(\"cannot write new kernel\");\n+\t\tpr_err(\"cannot write new kernel\");\n \t\tfastboot_fail(\"cannot write new kernel\");\n \t\treturn -1;\n \t}\n@@ -249,7 +249,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,\n \tres = blk_dwrite(dev_desc, ramdisk_sector_start, ramdisk_sectors,\n \t\t\t ramdisk_buffer);\n \tif (res == 0) {\n-\t\terror(\"cannot write back original ramdisk\");\n+\t\tpr_err(\"cannot write back original ramdisk\");\n \t\tfastboot_fail(\"cannot write back original ramdisk\");\n \t\treturn -1;\n \t}\n@@ -268,7 +268,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,\n \n \tdev_desc = blk_get_dev(\"mmc\", CONFIG_FASTBOOT_FLASH_MMC_DEV);\n \tif (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {\n-\t\terror(\"invalid mmc device\\n\");\n+\t\tpr_err(\"invalid mmc device\\n\");\n \t\tfastboot_fail(\"invalid mmc device\");\n \t\treturn;\n \t}\n@@ -322,7 +322,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,\n #endif\n \n \tif (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) {\n-\t\terror(\"cannot find partition: '%s'\\n\", cmd);\n+\t\tpr_err(\"cannot find partition: '%s'\\n\", cmd);\n \t\tfastboot_fail(\"cannot find partition\");\n \t\treturn;\n \t}\n@@ -360,21 +360,21 @@ void fb_mmc_erase(const char *cmd)\n \tstruct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV);\n \n \tif (mmc == NULL) {\n-\t\terror(\"invalid mmc device\");\n+\t\tpr_err(\"invalid mmc device\");\n \t\tfastboot_fail(\"invalid mmc device\");\n \t\treturn;\n \t}\n \n \tdev_desc = blk_get_dev(\"mmc\", CONFIG_FASTBOOT_FLASH_MMC_DEV);\n \tif (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {\n-\t\terror(\"invalid mmc device\");\n+\t\tpr_err(\"invalid mmc device\");\n \t\tfastboot_fail(\"invalid mmc device\");\n \t\treturn;\n \t}\n \n \tret = part_get_info_by_name_or_alias(dev_desc, cmd, &info);\n \tif (ret < 0) {\n-\t\terror(\"cannot find partition: '%s'\", cmd);\n+\t\tpr_err(\"cannot find partition: '%s'\", cmd);\n \t\tfastboot_fail(\"cannot find partition\");\n \t\treturn;\n \t}\n@@ -393,7 +393,7 @@ void fb_mmc_erase(const char *cmd)\n \n \tblks = blk_derase(dev_desc, blks_start, blks_size);\n \tif (blks != blks_size) {\n-\t\terror(\"failed erasing from device %d\", dev_desc->devnum);\n+\t\tpr_err(\"failed erasing from device %d\", dev_desc->devnum);\n \t\tfastboot_fail(\"failed erasing from device\");\n \t\treturn;\n \t}\ndiff --git a/common/fb_nand.c b/common/fb_nand.c\nindex 3d027d437554..aa28046cbd83 100644\n--- a/common/fb_nand.c\n+++ b/common/fb_nand.c\n@@ -40,20 +40,20 @@ static int fb_nand_lookup(const char *partname,\n \n \tret = mtdparts_init();\n \tif (ret) {\n-\t\terror(\"Cannot initialize MTD partitions\\n\");\n+\t\tpr_err(\"Cannot initialize MTD partitions\\n\");\n \t\tfastboot_fail(\"cannot init mtdparts\");\n \t\treturn ret;\n \t}\n \n \tret = find_dev_and_part(partname, &dev, &pnum, part);\n \tif (ret) {\n-\t\terror(\"cannot find partition: '%s'\", partname);\n+\t\tpr_err(\"cannot find partition: '%s'\", partname);\n \t\tfastboot_fail(\"cannot find partition\");\n \t\treturn ret;\n \t}\n \n \tif (dev->id->type != MTD_DEV_TYPE_NAND) {\n-\t\terror(\"partition '%s' is not stored on a NAND device\",\n+\t\tpr_err(\"partition '%s' is not stored on a NAND device\",\n \t\t partname);\n \t\tfastboot_fail(\"not a NAND device\");\n \t\treturn -EINVAL;\n@@ -154,7 +154,7 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,\n \n \tret = fb_nand_lookup(cmd, &mtd, &part);\n \tif (ret) {\n-\t\terror(\"invalid NAND device\");\n+\t\tpr_err(\"invalid NAND device\");\n \t\tfastboot_fail(\"invalid NAND device\");\n \t\treturn;\n \t}\n@@ -209,7 +209,7 @@ void fb_nand_erase(const char *cmd)\n \n \tret = fb_nand_lookup(cmd, &mtd, &part);\n \tif (ret) {\n-\t\terror(\"invalid NAND device\");\n+\t\tpr_err(\"invalid NAND device\");\n \t\tfastboot_fail(\"invalid NAND device\");\n \t\treturn;\n \t}\n@@ -220,7 +220,7 @@ void fb_nand_erase(const char *cmd)\n \n \tret = _fb_nand_erase(mtd, part);\n \tif (ret) {\n-\t\terror(\"failed erasing from device %s\", mtd->name);\n+\t\tpr_err(\"failed erasing from device %s\", mtd->name);\n \t\tfastboot_fail(\"failed erasing from device\");\n \t\treturn;\n \t}\ndiff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c\nindex 2c974735b11a..05bb21035df2 100644\n--- a/common/spl/spl_dfu.c\n+++ b/common/spl/spl_dfu.c\n@@ -42,13 +42,13 @@ int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr)\n \tset_default_env(0);\n \tstr_env = env_get(dfu_alt_info);\n \tif (!str_env) {\n-\t\terror(\"\\\"dfu_alt_info\\\" env variable not defined!\\n\");\n+\t\tpr_err(\"\\\"dfu_alt_info\\\" env variable not defined!\\n\");\n \t\treturn -EINVAL;\n \t}\n \n \tret = env_set(\"dfu_alt_info\", str_env);\n \tif (ret) {\n-\t\terror(\"unable to set env variable \\\"dfu_alt_info\\\"!\\n\");\n+\t\tpr_err(\"unable to set env variable \\\"dfu_alt_info\\\"!\\n\");\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c\nindex 350bcdb05695..333d518f4d6e 100644\n--- a/common/spl/spl_sdp.c\n+++ b/common/spl/spl_sdp.c\n@@ -24,13 +24,13 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,\n \n \tret = sdp_init(controller_index);\n \tif (ret) {\n-\t\terror(\"SDP init failed: %d\", ret);\n+\t\tpr_err(\"SDP init failed: %d\", ret);\n \t\treturn -ENODEV;\n \t}\n \n \t/* This command typically does not return but jumps to an image */\n \tsdp_handle(controller_index);\n-\terror(\"SDP ended\");\n+\tpr_err(\"SDP ended\");\n \n \treturn -EINVAL;\n }\ndiff --git a/common/update.c b/common/update.c\nindex 974f4655e7ef..33bffaa89eca 100644\n--- a/common/update.c\n+++ b/common/update.c\n@@ -242,7 +242,7 @@ int update_tftp(ulong addr, char *interface, char *devstring)\n \t} else if (interface && devstring) {\n \t\tupdate_tftp_dfu = true;\n \t} else {\n-\t\terror(\"Interface: %s and devstring: %s not supported!\\n\",\n+\t\tpr_err(\"Interface: %s and devstring: %s not supported!\\n\",\n \t\t interface, devstring);\n \t\treturn -EINVAL;\n \t}\ndiff --git a/disk/part_efi.c b/disk/part_efi.c\nindex 2973d52f6abb..e05a1386be28 100644\n--- a/disk/part_efi.c\n+++ b/disk/part_efi.c\n@@ -360,7 +360,7 @@ static int set_protective_mbr(struct blk_desc *dev_desc)\n \n \t/* Read MBR to backup boot code if it exists */\n \tif (blk_dread(dev_desc, 0, 1, p_mbr) != 1) {\n-\t\terror(\"** Can't read from device %d **\\n\", dev_desc->devnum);\n+\t\tpr_err(\"** Can't read from device %d **\\n\", dev_desc->devnum);\n \t\treturn -1;\n \t}\n \n@@ -716,7 +716,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,\n \n \tfor (i = 0; i < parts; i++) {\n \t\tif (i == gpt_head->num_partition_entries) {\n-\t\t\terror(\"More partitions than allowed!\\n\");\n+\t\t\tpr_err(\"More partitions than allowed!\\n\");\n \t\t\treturn -1;\n \t\t}\n \n@@ -729,7 +729,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,\n \n \t\tif (strncmp(efi_str, (char *)partitions[i].name,\n \t\t\t sizeof(partitions->name))) {\n-\t\t\terror(\"Partition name: %s does not match %s!\\n\",\n+\t\t\tpr_err(\"Partition name: %s does not match %s!\\n\",\n \t\t\t efi_str, (char *)partitions[i].name);\n \t\t\treturn -1;\n \t\t}\n@@ -746,7 +746,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,\n \t\t\tif ((i == parts - 1) && (partitions[i].size == 0))\n \t\t\t\tcontinue;\n \n-\t\t\terror(\"Partition %s size: %llu does not match %llu!\\n\",\n+\t\t\tpr_err(\"Partition %s size: %llu does not match %llu!\\n\",\n \t\t\t efi_str, (unsigned long long)gpt_part_size,\n \t\t\t (unsigned long long)partitions[i].size);\n \t\t\treturn -1;\n@@ -767,7 +767,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,\n \t\t (unsigned long long)partitions[i].start);\n \n \t\tif (le64_to_cpu(gpt_e[i].starting_lba) != partitions[i].start) {\n-\t\t\terror(\"Partition %s start: %llu does not match %llu!\\n\",\n+\t\t\tpr_err(\"Partition %s start: %llu does not match %llu!\\n\",\n \t\t\t efi_str, le64_to_cpu(gpt_e[i].starting_lba),\n \t\t\t (unsigned long long)partitions[i].start);\n \t\t\treturn -1;\ndiff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c\nindex a5ef722d2137..a4c20f4d3520 100644\n--- a/drivers/adc/adc-uclass.c\n+++ b/drivers/adc/adc-uclass.c\n@@ -64,7 +64,7 @@ static int adc_supply_enable(struct udevice *dev)\n \t}\n \n \tif (ret)\n-\t\terror(\"%s: can't enable %s-supply!\", dev->name, supply_type);\n+\t\tpr_err(\"%s: can't enable %s-supply!\", dev->name, supply_type);\n \n \treturn ret;\n }\n@@ -389,12 +389,12 @@ static int adc_pre_probe(struct udevice *dev)\n \t/* Set ADC VDD platdata: polarity, uV, regulator (phandle). */\n \tret = adc_vdd_platdata_set(dev);\n \tif (ret)\n-\t\terror(\"%s: Can't update Vdd. Error: %d\", dev->name, ret);\n+\t\tpr_err(\"%s: Can't update Vdd. Error: %d\", dev->name, ret);\n \n \t/* Set ADC VSS platdata: polarity, uV, regulator (phandle). */\n \tret = adc_vss_platdata_set(dev);\n \tif (ret)\n-\t\terror(\"%s: Can't update Vss. Error: %d\", dev->name, ret);\n+\t\tpr_err(\"%s: Can't update Vss. Error: %d\", dev->name, ret);\n \n \treturn 0;\n }\ndiff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c\nindex 324d72f3a959..3bb065d2155c 100644\n--- a/drivers/adc/exynos-adc.c\n+++ b/drivers/adc/exynos-adc.c\n@@ -22,7 +22,7 @@ int exynos_adc_channel_data(struct udevice *dev, int channel,\n \tstruct exynos_adc_v2 *regs = priv->regs;\n \n \tif (channel != priv->active_channel) {\n-\t\terror(\"Requested channel is not active!\");\n+\t\tpr_err(\"Requested channel is not active!\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -80,7 +80,7 @@ int exynos_adc_probe(struct udevice *dev)\n \n \t/* Check HW version */\n \tif (readl(®s->version) != ADC_V2_VERSION) {\n-\t\terror(\"This driver supports only ADC v2!\");\n+\t\tpr_err(\"This driver supports only ADC v2!\");\n \t\treturn -ENXIO;\n \t}\n \n@@ -109,7 +109,7 @@ int exynos_adc_ofdata_to_platdata(struct udevice *dev)\n \n \tpriv->regs = (struct exynos_adc_v2 *)devfdt_get_addr(dev);\n \tif (priv->regs == (struct exynos_adc_v2 *)FDT_ADDR_T_NONE) {\n-\t\terror(\"Dev: %s - can't get address!\", dev->name);\n+\t\tpr_err(\"Dev: %s - can't get address!\", dev->name);\n \t\treturn -ENODATA;\n \t}\n \ndiff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c\nindex 371892237aa4..80e8e3701a34 100644\n--- a/drivers/adc/sandbox.c\n+++ b/drivers/adc/sandbox.c\n@@ -61,7 +61,7 @@ int sandbox_adc_channel_data(struct udevice *dev, int channel,\n \t/* For single-channel conversion mode, check if channel was selected */\n \tif ((priv->conversion_mode == SANDBOX_ADC_MODE_SINGLE_CHANNEL) &&\n \t !(priv->active_channel_mask & (1 << channel))) {\n-\t\terror(\"Request for an inactive channel!\");\n+\t\tpr_err(\"Request for an inactive channel!\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -82,12 +82,12 @@ int sandbox_adc_channels_data(struct udevice *dev, unsigned int channel_mask,\n \n \t/* Return error for single-channel conversion mode */\n \tif (priv->conversion_mode == SANDBOX_ADC_MODE_SINGLE_CHANNEL) {\n-\t\terror(\"ADC in single-channel mode!\");\n+\t\tpr_err(\"ADC in single-channel mode!\");\n \t\treturn -EPERM;\n \t}\n \t/* Check channel selection */\n \tif (!(priv->active_channel_mask & channel_mask)) {\n-\t\terror(\"Request for an inactive channel!\");\n+\t\tpr_err(\"Request for an inactive channel!\");\n \t\treturn -EINVAL;\n \t}\n \t/* The conversion must be started before reading the data */\ndiff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c\nindex f6147989b1c8..b16304baedbd 100644\n--- a/drivers/ata/dwc_ahci.c\n+++ b/drivers/ata/dwc_ahci.c\n@@ -58,19 +58,19 @@ static int dwc_ahci_probe(struct udevice *dev)\n \n \tret = generic_phy_get_by_name(dev, \"sata-phy\", &phy);\n \tif (ret) {\n-\t\terror(\"can't get the phy from DT\\n\");\n+\t\tpr_err(\"can't get the phy from DT\\n\");\n \t\treturn ret;\n \t}\n \n \tret = generic_phy_init(&phy);\n \tif (ret) {\n-\t\terror(\"unable to initialize the sata phy\\n\");\n+\t\tpr_err(\"unable to initialize the sata phy\\n\");\n \t\treturn ret;\n \t}\n \n \tret = generic_phy_power_on(&phy);\n \tif (ret) {\n-\t\terror(\"unable to power on the sata phy\\n\");\n+\t\tpr_err(\"unable to power on the sata phy\\n\");\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c\nindex 78f1b759d838..5c05e3d78d5b 100644\n--- a/drivers/clk/clk_boston.c\n+++ b/drivers/clk/clk_boston.c\n@@ -67,13 +67,13 @@ static int clk_boston_ofdata_to_platdata(struct udevice *dev)\n \terr = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,\n \t\t\t\t\t \"regmap\", &syscon);\n \tif (err) {\n-\t\terror(\"unable to find syscon device\\n\");\n+\t\tpr_err(\"unable to find syscon device\\n\");\n \t\treturn err;\n \t}\n \n \tstate->regmap = syscon_get_regmap(syscon);\n \tif (!state->regmap) {\n-\t\terror(\"unable to find regmap\\n\");\n+\t\tpr_err(\"unable to find regmap\\n\");\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/clk/clk_stm32f7.c b/drivers/clk/clk_stm32f7.c\nindex 255a583c9545..ad3cafc49fb7 100644\n--- a/drivers/clk/clk_stm32f7.c\n+++ b/drivers/clk/clk_stm32f7.c\n@@ -224,7 +224,7 @@ static unsigned long stm32_clk_get_rate(struct clk *clk)\n \t\treturn sysclk >>= shift;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"clock index %ld out of range\\n\", clk->id);\n+\t\tpr_err(\"clock index %ld out of range\\n\", clk->id);\n \t\treturn -EINVAL;\n \t\tbreak;\n \t}\ndiff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c\nindex 2be1f572d721..d46a73a2eaf2 100644\n--- a/drivers/clk/rockchip/clk_rk3368.c\n+++ b/drivers/clk/rockchip/clk_rk3368.c\n@@ -301,7 +301,7 @@ static ulong rk3368_ddr_set_clk(struct rk3368_cru *cru, ulong set_rate)\n \t\tdpll_cfg = &dpll_1600;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Unsupported SDRAM frequency!,%ld\\n\", set_rate);\n+\t\tpr_err(\"Unsupported SDRAM frequency!,%ld\\n\", set_rate);\n \t}\n \trkclk_set_pll(cru, DPLL, dpll_cfg);\n \n@@ -359,7 +359,7 @@ static ulong rk3368_spi_get_clk(struct rk3368_cru *cru, ulong clk_id)\n \t\tbreak;\n \n \tdefault:\n-\t\terror(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n+\t\tpr_err(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -384,7 +384,7 @@ static ulong rk3368_spi_set_clk(struct rk3368_cru *cru, ulong clk_id, uint hz)\n \t\tbreak;\n \n \tdefault:\n-\t\terror(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n+\t\tpr_err(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -498,7 +498,7 @@ static int rk3368_clk_bind(struct udevice *dev)\n \t/* The reset driver does not have a device node, so bind it here */\n \tret = device_bind_driver(gd->dm_root, \"rk3368_sysreset\", \"reset\", &dev);\n \tif (ret)\n-\t\terror(\"bind RK3368 reset driver failed: ret=%d\\n\", ret);\n+\t\tpr_err(\"bind RK3368 reset driver failed: ret=%d\\n\", ret);\n \n \treturn ret;\n }\ndiff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c\nindex 3edafea14007..c6859f3d5f5e 100644\n--- a/drivers/clk/rockchip/clk_rk3399.c\n+++ b/drivers/clk/rockchip/clk_rk3399.c\n@@ -661,7 +661,7 @@ static ulong rk3399_spi_get_clk(struct rk3399_cru *cru, ulong clk_id)\n \t\tbreak;\n \n \tdefault:\n-\t\terror(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n+\t\tpr_err(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -685,7 +685,7 @@ static ulong rk3399_spi_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz)\n \t\tbreak;\n \n \tdefault:\n-\t\terror(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n+\t\tpr_err(\"%s: SPI clk-id %ld not supported\\n\", __func__, clk_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -854,7 +854,7 @@ static ulong rk3399_ddr_set_clk(struct rk3399_cru *cru,\n \t\t{.refdiv = 1, .fbdiv = 116, .postdiv1 = 3, .postdiv2 = 1};\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Unsupported SDRAM frequency!,%ld\\n\", set_rate);\n+\t\tpr_err(\"Unsupported SDRAM frequency!,%ld\\n\", set_rate);\n \t}\n \trkclk_set_pll(&cru->dpll_con[0], &dpll_cfg);\n \ndiff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c\nindex cf966bbdc339..9f0ae6c941ac 100644\n--- a/drivers/clk/rockchip/clk_rv1108.c\n+++ b/drivers/clk/rockchip/clk_rv1108.c\n@@ -196,7 +196,7 @@ static int rv1108_clk_bind(struct udevice *dev)\n \t/* The reset driver does not have a device node, so bind it here */\n \tret = device_bind_driver(gd->dm_root, \"rv1108_sysreset\", \"reset\", &dev);\n \tif (ret)\n-\t\terror(\"No Rv1108 reset driver: ret=%d\\n\", ret);\n+\t\tpr_err(\"No Rv1108 reset driver: ret=%d\\n\", ret);\n \n \treturn 0;\n }\ndiff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c\nindex ff732ac309fe..2c22b625b8bd 100644\n--- a/drivers/dfu/dfu.c\n+++ b/drivers/dfu/dfu.c\n@@ -64,14 +64,14 @@ int dfu_init_env_entities(char *interface, char *devstr)\n #endif\n \tstr_env = env_get(\"dfu_alt_info\");\n \tif (!str_env) {\n-\t\terror(\"\\\"dfu_alt_info\\\" env variable not defined!\\n\");\n+\t\tpr_err(\"\\\"dfu_alt_info\\\" env variable not defined!\\n\");\n \t\treturn -EINVAL;\n \t}\n \n \tenv_bkp = strdup(str_env);\n \tret = dfu_config_entities(env_bkp, interface, devstr);\n \tif (ret) {\n-\t\terror(\"DFU entities configuration failed!\\n\");\n+\t\tpr_err(\"DFU entities configuration failed!\\n\");\n \t\treturn ret;\n \t}\n \n@@ -132,7 +132,7 @@ static char *dfu_get_hash_algo(void)\n \t\treturn s;\n \t}\n \n-\terror(\"DFU hash method: %s not supported!\\n\", s);\n+\tpr_err(\"DFU hash method: %s not supported!\\n\", s);\n \treturn NULL;\n }\n \n@@ -273,7 +273,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)\n \n \t/* we should be in buffer now (if not then size too large) */\n \tif ((dfu->i_buf + size) > dfu->i_buf_end) {\n-\t\terror(\"Buffer overflow! (0x%p + 0x%x > 0x%p)\\n\", dfu->i_buf,\n+\t\tpr_err(\"Buffer overflow! (0x%p + 0x%x > 0x%p)\\n\", dfu->i_buf,\n \t\t size, dfu->i_buf_end);\n \t\tdfu_transaction_cleanup(dfu);\n \t\treturn -1;\n@@ -451,7 +451,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr)\n \tif (s) {\n \t\tret = hash_lookup_algo(s, &dfu_hash_algo);\n \t\tif (ret)\n-\t\t\terror(\"Hash algorithm %s not supported\\n\", s);\n+\t\t\tpr_err(\"Hash algorithm %s not supported\\n\", s);\n \t}\n \n \tdfu = calloc(sizeof(*dfu), dfu_alt_num);\n@@ -576,7 +576,7 @@ int dfu_write_from_mem_addr(struct dfu_entity *dfu, void *buf, int size)\n \t\t dp, left, write);\n \t\tret = dfu_write(dfu, dp, write, i);\n \t\tif (ret) {\n-\t\t\terror(\"DFU write failed\\n\");\n+\t\t\tpr_err(\"DFU write failed\\n\");\n \t\t\treturn ret;\n \t\t}\n \n@@ -586,7 +586,7 @@ int dfu_write_from_mem_addr(struct dfu_entity *dfu, void *buf, int size)\n \n \tret = dfu_flush(dfu, NULL, 0, i);\n \tif (ret)\n-\t\terror(\"DFU flush failed!\");\n+\t\tpr_err(\"DFU flush failed!\");\n \n \treturn ret;\n }\ndiff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c\nindex 39e10b1a5a67..47948d369d95 100644\n--- a/drivers/dfu/dfu_mmc.c\n+++ b/drivers/dfu/dfu_mmc.c\n@@ -29,7 +29,7 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,\n \n \tmmc = find_mmc_device(dfu->data.mmc.dev_num);\n \tif (!mmc) {\n-\t\terror(\"Device MMC %d - not found!\", dfu->data.mmc.dev_num);\n+\t\tpr_err(\"Device MMC %d - not found!\", dfu->data.mmc.dev_num);\n \t\treturn -ENODEV;\n \t}\n \n@@ -69,11 +69,11 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,\n \t\t\t buf);\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Operation not supported\\n\");\n+\t\tpr_err(\"Operation not supported\\n\");\n \t}\n \n \tif (n != blk_count) {\n-\t\terror(\"MMC operation failed\");\n+\t\tpr_err(\"MMC operation failed\");\n \t\tif (dfu->data.mmc.hw_partition >= 0)\n \t\t\tblk_select_hwpart_devnum(IF_TYPE_MMC,\n \t\t\t\t\t\t dfu->data.mmc.dev_num,\n@@ -312,7 +312,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s)\n \tfor (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) {\n \t\t*parg = strsep(&s, \" \");\n \t\tif (*parg == NULL) {\n-\t\t\terror(\"Invalid number of arguments.\\n\");\n+\t\t\tpr_err(\"Invalid number of arguments.\\n\");\n \t\t\treturn -ENODEV;\n \t\t}\n \t}\n@@ -327,13 +327,13 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s)\n \n \tmmc = find_mmc_device(dfu->data.mmc.dev_num);\n \tif (mmc == NULL) {\n-\t\terror(\"Couldn't find MMC device no. %d.\\n\",\n+\t\tpr_err(\"Couldn't find MMC device no. %d.\\n\",\n \t\t dfu->data.mmc.dev_num);\n \t\treturn -ENODEV;\n \t}\n \n \tif (mmc_init(mmc)) {\n-\t\terror(\"Couldn't init MMC device.\\n\");\n+\t\tpr_err(\"Couldn't init MMC device.\\n\");\n \t\treturn -ENODEV;\n \t}\n \n@@ -360,7 +360,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s)\n \t\tint mmcpart = third_arg;\n \n \t\tif (part_get_info(blk_dev, mmcpart, &partinfo) != 0) {\n-\t\t\terror(\"Couldn't find part #%d on mmc device #%d\\n\",\n+\t\t\tpr_err(\"Couldn't find part #%d on mmc device #%d\\n\",\n \t\t\t mmcpart, mmcdev);\n \t\t\treturn -ENODEV;\n \t\t}\n@@ -374,7 +374,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s)\n \t} else if (!strcmp(entity_type, \"ext4\")) {\n \t\tdfu->layout = DFU_FS_EXT4;\n \t} else {\n-\t\terror(\"Memory layout (%s) not supported!\\n\", entity_type);\n+\t\tpr_err(\"Memory layout (%s) not supported!\\n\", entity_type);\n \t\treturn -ENODEV;\n \t}\n \n@@ -397,7 +397,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s)\n \t\tdfu_file_buf = memalign(CONFIG_SYS_CACHELINE_SIZE,\n \t\t\t\t\tCONFIG_SYS_DFU_MAX_FILE_SIZE);\n \t\tif (!dfu_file_buf) {\n-\t\t\terror(\"Could not memalign 0x%x bytes\",\n+\t\t\tpr_err(\"Could not memalign 0x%x bytes\",\n \t\t\t CONFIG_SYS_DFU_MAX_FILE_SIZE);\n \t\t\treturn -ENOMEM;\n \t\t}\ndiff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c\nindex 6e3f5316f5ad..2b5e05a913ee 100644\n--- a/drivers/dfu/dfu_ram.c\n+++ b/drivers/dfu/dfu_ram.c\n@@ -18,12 +18,12 @@ static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,\n \t\t\t\t u64 offset, void *buf, long *len)\n {\n \tif (dfu->layout != DFU_RAM_ADDR) {\n-\t\terror(\"unsupported layout: %s\\n\", dfu_get_layout(dfu->layout));\n+\t\tpr_err(\"unsupported layout: %s\\n\", dfu_get_layout(dfu->layout));\n \t\treturn -EINVAL;\n \t}\n \n \tif (offset > dfu->data.ram.size) {\n-\t\terror(\"request exceeds allowed area\\n\");\n+\t\tpr_err(\"request exceeds allowed area\\n\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -62,14 +62,14 @@ int dfu_fill_entity_ram(struct dfu_entity *dfu, char *devstr, char *s)\n \tfor (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) {\n \t\t*parg = strsep(&s, \" \");\n \t\tif (*parg == NULL) {\n-\t\t\terror(\"Invalid number of arguments.\\n\");\n+\t\t\tpr_err(\"Invalid number of arguments.\\n\");\n \t\t\treturn -ENODEV;\n \t\t}\n \t}\n \n \tdfu->dev_type = DFU_DEV_RAM;\n \tif (strcmp(argv[0], \"ram\")) {\n-\t\terror(\"unsupported device: %s\\n\", argv[0]);\n+\t\tpr_err(\"unsupported device: %s\\n\", argv[0]);\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c\nindex cd71708231f5..62bf797dac9f 100644\n--- a/drivers/dfu/dfu_tftp.c\n+++ b/drivers/dfu/dfu_tftp.c\n@@ -43,7 +43,7 @@ int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,\n \talt_setting_num = dfu_get_alt(sb);\n \tfree(sb);\n \tif (alt_setting_num < 0) {\n-\t\terror(\"Alt setting [%d] to write not found!\",\n+\t\tpr_err(\"Alt setting [%d] to write not found!\",\n \t\t alt_setting_num);\n \t\tret = -ENODEV;\n \t\tgoto done;\n@@ -51,7 +51,7 @@ int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,\n \n \tdfu = dfu_get_entity(alt_setting_num);\n \tif (!dfu) {\n-\t\terror(\"DFU entity for alt: %d not found!\", alt_setting_num);\n+\t\tpr_err(\"DFU entity for alt: %d not found!\", alt_setting_num);\n \t\tret = -ENODEV;\n \t\tgoto done;\n \t}\ndiff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c\nindex ea21fd9c6feb..3d0ce22fbc21 100644\n--- a/drivers/dma/dma-uclass.c\n+++ b/drivers/dma/dma-uclass.c\n@@ -33,7 +33,7 @@ int dma_get_device(u32 transfer_type, struct udevice **devp)\n \t}\n \n \tif (!dev) {\n-\t\terror(\"No DMA device found that supports %x type\\n\",\n+\t\tpr_err(\"No DMA device found that supports %x type\\n\",\n \t\t transfer_type);\n \t\treturn -EPROTONOSUPPORT;\n \t}\ndiff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c\nindex 955adfeccda1..63a8a2f34080 100644\n--- a/drivers/dma/lpc32xx_dma.c\n+++ b/drivers/dma/lpc32xx_dma.c\n@@ -96,7 +96,7 @@ int lpc32xx_dma_start_xfer(unsigned int channel,\n {\n \tif (unlikely(((BIT_MASK(channel) & alloc_ch) == 0) ||\n \t\t (channel >= DMA_NO_OF_CHANNELS))) {\n-\t\terror(\"Request for xfer on unallocated channel %d\", channel);\n+\t\tpr_err(\"Request for xfer on unallocated channel %d\", channel);\n \t\treturn -1;\n \t}\n \twritel(BIT_MASK(channel), &dma->int_tc_clear);\n@@ -117,7 +117,7 @@ int lpc32xx_dma_wait_status(unsigned int channel)\n \n \t/* Check if given channel is valid */\n \tif (unlikely(channel >= DMA_NO_OF_CHANNELS)) {\n-\t\terror(\"Request for status on unallocated channel %d\", channel);\n+\t\tpr_err(\"Request for status on unallocated channel %d\", channel);\n \t\treturn -1;\n \t}\n \n@@ -129,7 +129,7 @@ int lpc32xx_dma_wait_status(unsigned int channel)\n \t\t\tbreak;\n \n \t\tif (get_timer(start) > CONFIG_SYS_HZ) {\n-\t\t\terror(\"DMA status timeout channel %d\\n\", channel);\n+\t\t\tpr_err(\"DMA status timeout channel %d\\n\", channel);\n \t\t\treturn -ETIMEDOUT;\n \t\t}\n \t\tudelay(1);\n@@ -138,7 +138,7 @@ int lpc32xx_dma_wait_status(unsigned int channel)\n \tif (unlikely(readl(&dma->raw_err_stat) & BIT_MASK(channel))) {\n \t\tsetbits_le32(&dma->int_err_clear, BIT_MASK(channel));\n \t\tsetbits_le32(&dma->raw_err_stat, BIT_MASK(channel));\n-\t\terror(\"DMA error on channel %d\\n\", channel);\n+\t\tpr_err(\"DMA error on channel %d\\n\", channel);\n \t\treturn -1;\n \t}\n \tsetbits_le32(&dma->int_tc_clear, BIT_MASK(channel));\ndiff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c\nindex 39e97930135a..635eb7876d55 100644\n--- a/drivers/dma/ti-edma3.c\n+++ b/drivers/dma/ti-edma3.c\n@@ -491,7 +491,7 @@ static int ti_edma3_transfer(struct udevice *dev, int direction, void *dst,\n \t\t__edma3_transfer(priv->base, 1, dst, src, len);\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Transfer type not implemented in DMA driver\\n\");\n+\t\tpr_err(\"Transfer type not implemented in DMA driver\\n\");\n \t\tbreak;\n \t}\n \ndiff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c\nindex aeeb304a876f..4e8fa214739a 100644\n--- a/drivers/i2c/i2c-gpio.c\n+++ b/drivers/i2c/i2c-gpio.c\n@@ -322,7 +322,7 @@ static int i2c_gpio_ofdata_to_platdata(struct udevice *dev)\n \n \treturn 0;\n error:\n-\terror(\"Can't get %s gpios! Error: %d\", dev->name, ret);\n+\tpr_err(\"Can't get %s gpios! Error: %d\", dev->name, ret);\n \treturn ret;\n }\n \ndiff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c\nindex c98c6276ddb4..5d3381514621 100644\n--- a/drivers/i2c/omap24xx_i2c.c\n+++ b/drivers/i2c/omap24xx_i2c.c\n@@ -755,7 +755,7 @@ static uint omap24_i2c_setspeed(struct i2c_adapter *adap, uint speed)\n \n \tret = __omap24_i2c_setspeed(i2c_base, speed, &adap->waitdelay);\n \tif (ret) {\n-\t\terror(\"%s: set i2c speed failed\\n\", __func__);\n+\t\tpr_err(\"%s: set i2c speed failed\\n\", __func__);\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c\nindex bf5fefab7bfb..196f2365ea5f 100644\n--- a/drivers/i2c/stm32f7_i2c.c\n+++ b/drivers/i2c/stm32f7_i2c.c\n@@ -549,7 +549,7 @@ static int stm32_i2c_compute_solutions(struct stm32_i2c_setup *setup,\n \t}\n \n \tif (list_empty(solutions)) {\n-\t\terror(\"%s: no Prescaler solution\\n\", __func__);\n+\t\tpr_err(\"%s: no Prescaler solution\\n\", __func__);\n \t\tret = -EPERM;\n \t}\n \n@@ -627,7 +627,7 @@ static int stm32_i2c_choose_solution(struct stm32_i2c_setup *setup,\n \t}\n \n \tif (!s) {\n-\t\terror(\"%s: no solution at all\\n\", __func__);\n+\t\tpr_err(\"%s: no solution at all\\n\", __func__);\n \t\tret = -EPERM;\n \t}\n \n@@ -643,14 +643,14 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv *i2c_priv,\n \tint ret;\n \n \tif (setup->speed >= STM32_I2C_SPEED_END) {\n-\t\terror(\"%s: speed out of bound {%d/%d}\\n\", __func__,\n+\t\tpr_err(\"%s: speed out of bound {%d/%d}\\n\", __func__,\n \t\t setup->speed, STM32_I2C_SPEED_END - 1);\n \t\treturn -EINVAL;\n \t}\n \n \tif ((setup->rise_time > i2c_specs[setup->speed].rise_max) ||\n \t (setup->fall_time > i2c_specs[setup->speed].fall_max)) {\n-\t\terror(\"%s :timings out of bound Rise{%d>%d}/Fall{%d>%d}\\n\",\n+\t\tpr_err(\"%s :timings out of bound Rise{%d>%d}/Fall{%d>%d}\\n\",\n \t\t __func__,\n \t\t setup->rise_time, i2c_specs[setup->speed].rise_max,\n \t\t setup->fall_time, i2c_specs[setup->speed].fall_max);\n@@ -658,13 +658,13 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv *i2c_priv,\n \t}\n \n \tif (setup->dnf > STM32_I2C_DNF_MAX) {\n-\t\terror(\"%s: DNF out of bound %d/%d\\n\", __func__,\n+\t\tpr_err(\"%s: DNF out of bound %d/%d\\n\", __func__,\n \t\t setup->dnf, STM32_I2C_DNF_MAX);\n \t\treturn -EINVAL;\n \t}\n \n \tif (setup->speed_freq > i2c_specs[setup->speed].rate) {\n-\t\terror(\"%s: Freq {%d/%d}\\n\", __func__,\n+\t\tpr_err(\"%s: Freq {%d/%d}\\n\", __func__,\n \t\t setup->speed_freq, i2c_specs[setup->speed].rate);\n \t\treturn -EINVAL;\n \t}\n@@ -711,7 +711,7 @@ static int stm32_i2c_setup_timing(struct stm32_i2c_priv *i2c_priv,\n \tsetup->clock_src = clk_get_rate(&i2c_priv->clk);\n \n \tif (!setup->clock_src) {\n-\t\terror(\"%s: clock rate is 0\\n\", __func__);\n+\t\tpr_err(\"%s: clock rate is 0\\n\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -734,7 +734,7 @@ static int stm32_i2c_setup_timing(struct stm32_i2c_priv *i2c_priv,\n \t} while (ret);\n \n \tif (ret) {\n-\t\terror(\"%s: impossible to compute I2C timings.\\n\", __func__);\n+\t\tpr_err(\"%s: impossible to compute I2C timings.\\n\", __func__);\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c\nindex 3255e8ed3709..7d23e51b69d2 100644\n--- a/drivers/i2c/tegra_i2c.c\n+++ b/drivers/i2c/tegra_i2c.c\n@@ -372,12 +372,12 @@ static int tegra_i2c_probe(struct udevice *dev)\n \n \tret = reset_get_by_name(dev, \"i2c\", &i2c_bus->reset_ctl);\n \tif (ret) {\n-\t\terror(\"reset_get_by_name() failed: %d\\n\", ret);\n+\t\tpr_err(\"reset_get_by_name() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \tret = clk_get_by_name(dev, \"div-clk\", &i2c_bus->clk);\n \tif (ret) {\n-\t\terror(\"clk_get_by_name() failed: %d\\n\", ret);\n+\t\tpr_err(\"clk_get_by_name() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c\nindex d61bacfc44f2..1fdf8efff3b9 100644\n--- a/drivers/misc/tegra186_bpmp.c\n+++ b/drivers/misc/tegra186_bpmp.c\n@@ -44,7 +44,7 @@ static int tegra186_bpmp_call(struct udevice *dev, int mrq, void *tx_msg,\n \n \tret = tegra_ivc_write_get_next_frame(&priv->ivc, &ivc_frame);\n \tif (ret) {\n-\t\terror(\"tegra_ivc_write_get_next_frame() failed: %d\\n\", ret);\n+\t\tpr_err(\"tegra_ivc_write_get_next_frame() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -55,7 +55,7 @@ static int tegra186_bpmp_call(struct udevice *dev, int mrq, void *tx_msg,\n \n \tret = tegra_ivc_write_advance(&priv->ivc);\n \tif (ret) {\n-\t\terror(\"tegra_ivc_write_advance() failed: %d\\n\", ret);\n+\t\tpr_err(\"tegra_ivc_write_advance() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -63,7 +63,7 @@ static int tegra186_bpmp_call(struct udevice *dev, int mrq, void *tx_msg,\n \tfor (;;) {\n \t\tret = tegra_ivc_channel_notified(&priv->ivc);\n \t\tif (ret) {\n-\t\t\terror(\"tegra_ivc_channel_notified() failed: %d\\n\", ret);\n+\t\t\tpr_err(\"tegra_ivc_channel_notified() failed: %d\\n\", ret);\n \t\t\treturn ret;\n \t\t}\n \n@@ -73,7 +73,7 @@ static int tegra186_bpmp_call(struct udevice *dev, int mrq, void *tx_msg,\n \n \t\t/* Timeout 20ms; roughly 10x current max observed duration */\n \t\tif ((timer_get_us() - start_time) > 20 * 1000) {\n-\t\t\terror(\"tegra_ivc_read_get_next_frame() timed out (%d)\\n\",\n+\t\t\tpr_err(\"tegra_ivc_read_get_next_frame() timed out (%d)\\n\",\n \t\t\t ret);\n \t\t\treturn -ETIMEDOUT;\n \t\t}\n@@ -86,12 +86,12 @@ static int tegra186_bpmp_call(struct udevice *dev, int mrq, void *tx_msg,\n \n \tret = tegra_ivc_read_advance(&priv->ivc);\n \tif (ret) {\n-\t\terror(\"tegra_ivc_write_advance() failed: %d\\n\", ret);\n+\t\tpr_err(\"tegra_ivc_write_advance() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \tif (err) {\n-\t\terror(\"BPMP responded with error %d\\n\", err);\n+\t\tpr_err(\"BPMP responded with error %d\\n\", err);\n \t\t/* err isn't a U-Boot error code, so don't that */\n \t\treturn -EIO;\n \t}\n@@ -144,14 +144,14 @@ static ulong tegra186_bpmp_get_shmem(struct udevice *dev, int index)\n \tret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev),\n \t\t\t\t\t \"shmem\", NULL, 0, index, &args);\n \tif (ret < 0) {\n-\t\terror(\"fdtdec_parse_phandle_with_args() failed: %d\\n\", ret);\n+\t\tpr_err(\"fdtdec_parse_phandle_with_args() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \treg = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, args.node,\n \t\t\t\t\t\t \"reg\", 0, NULL, true);\n \tif (reg == FDT_ADDR_T_NONE) {\n-\t\terror(\"fdtdec_get_addr_size_auto_noparent() failed\\n\");\n+\t\tpr_err(\"fdtdec_get_addr_size_auto_noparent() failed\\n\");\n \t\treturn -ENODEV;\n \t}\n \n@@ -166,7 +166,7 @@ static void tegra186_bpmp_ivc_notify(struct tegra_ivc *ivc)\n \n \tret = mbox_send(&priv->mbox, NULL);\n \tif (ret)\n-\t\terror(\"mbox_send() failed: %d\\n\", ret);\n+\t\tpr_err(\"mbox_send() failed: %d\\n\", ret);\n }\n \n static int tegra186_bpmp_probe(struct udevice *dev)\n@@ -179,18 +179,18 @@ static int tegra186_bpmp_probe(struct udevice *dev)\n \n \tret = mbox_get_by_index(dev, 0, &priv->mbox);\n \tif (ret) {\n-\t\terror(\"mbox_get_by_index() failed: %d\\n\", ret);\n+\t\tpr_err(\"mbox_get_by_index() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \ttx_base = tegra186_bpmp_get_shmem(dev, 0);\n \tif (IS_ERR_VALUE(tx_base)) {\n-\t\terror(\"tegra186_bpmp_get_shmem failed for tx_base\\n\");\n+\t\tpr_err(\"tegra186_bpmp_get_shmem failed for tx_base\\n\");\n \t\treturn tx_base;\n \t}\n \trx_base = tegra186_bpmp_get_shmem(dev, 1);\n \tif (IS_ERR_VALUE(rx_base)) {\n-\t\terror(\"tegra186_bpmp_get_shmem failed for rx_base\\n\");\n+\t\tpr_err(\"tegra186_bpmp_get_shmem failed for rx_base\\n\");\n \t\treturn rx_base;\n \t}\n \tdebug(\"shmem: rx=%lx, tx=%lx\\n\", rx_base, tx_base);\n@@ -198,7 +198,7 @@ static int tegra186_bpmp_probe(struct udevice *dev)\n \tret = tegra_ivc_init(&priv->ivc, rx_base, tx_base, BPMP_IVC_FRAME_COUNT,\n \t\t\t BPMP_IVC_FRAME_SIZE, tegra186_bpmp_ivc_notify);\n \tif (ret) {\n-\t\terror(\"tegra_ivc_init() failed: %d\\n\", ret);\n+\t\tpr_err(\"tegra_ivc_init() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -211,7 +211,7 @@ static int tegra186_bpmp_probe(struct udevice *dev)\n \n \t\t/* Timeout 100ms */\n \t\tif ((timer_get_us() - start_time) > 100 * 1000) {\n-\t\t\terror(\"Initial IVC reset timed out (%d)\\n\", ret);\n+\t\t\tpr_err(\"Initial IVC reset timed out (%d)\\n\", ret);\n \t\t\tret = -ETIMEDOUT;\n \t\t\tgoto err_free_mbox;\n \t\t}\ndiff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c\nindex 40f7892ac80b..5edd383c6848 100644\n--- a/drivers/mmc/exynos_dw_mmc.c\n+++ b/drivers/mmc/exynos_dw_mmc.c\n@@ -155,7 +155,7 @@ static int exynos_dwmci_get_config(const void *blob, int node,\n \n \tpriv = malloc(sizeof(struct dwmci_exynos_priv_data));\n \tif (!priv) {\n-\t\terror(\"dwmci_exynos_priv_data malloc fail!\\n\");\n+\t\tpr_err(\"dwmci_exynos_priv_data malloc fail!\\n\");\n \t\treturn -ENOMEM;\n \t}\n \ndiff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c\nindex d795198534b7..44a8ef825f32 100644\n--- a/drivers/mmc/hi6220_dw_mmc.c\n+++ b/drivers/mmc/hi6220_dw_mmc.c\n@@ -44,7 +44,7 @@ int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width)\n \n \thost = calloc(1, sizeof(struct dwmci_host));\n \tif (!host) {\n-\t\terror(\"dwmci_host calloc failed!\\n\");\n+\t\tpr_err(\"dwmci_host calloc failed!\\n\");\n \t\treturn -ENOMEM;\n \t}\n \ndiff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c\nindex 2b7cb7f6b66a..490a01f9bdb8 100644\n--- a/drivers/mmc/xenon_sdhci.c\n+++ b/drivers/mmc/xenon_sdhci.c\n@@ -159,7 +159,7 @@ static int xenon_mmc_phy_init(struct sdhci_host *host)\n \t}\n \n \tif (time <= 0) {\n-\t\terror(\"Failed to enable MMC internal clock in time\\n\");\n+\t\tpr_err(\"Failed to enable MMC internal clock in time\\n\");\n \t\treturn -ETIMEDOUT;\n \t}\n \n@@ -187,7 +187,7 @@ static int xenon_mmc_phy_init(struct sdhci_host *host)\n \t}\n \n \tif (time <= 0) {\n-\t\terror(\"Failed to init MMC PHY in time\\n\");\n+\t\tpr_err(\"Failed to init MMC PHY in time\\n\");\n \t\treturn -ETIMEDOUT;\n \t}\n \ndiff --git a/drivers/mtd/nand/lpc32xx_nand_mlc.c b/drivers/mtd/nand/lpc32xx_nand_mlc.c\nindex 3af7e6dfac69..e1b36706cab3 100644\n--- a/drivers/mtd/nand/lpc32xx_nand_mlc.c\n+++ b/drivers/mtd/nand/lpc32xx_nand_mlc.c\n@@ -583,21 +583,21 @@ void board_nand_init(void)\n \t/* identify chip */\n \tret = nand_scan_ident(mtd, CONFIG_SYS_MAX_NAND_CHIPS, NULL);\n \tif (ret) {\n-\t\terror(\"nand_scan_ident returned %i\", ret);\n+\t\tpr_err(\"nand_scan_ident returned %i\", ret);\n \t\treturn;\n \t}\n \n \t/* finish scanning the chip */\n \tret = nand_scan_tail(mtd);\n \tif (ret) {\n-\t\terror(\"nand_scan_tail returned %i\", ret);\n+\t\tpr_err(\"nand_scan_tail returned %i\", ret);\n \t\treturn;\n \t}\n \n \t/* chip is good, register it */\n \tret = nand_register(0, mtd);\n \tif (ret)\n-\t\terror(\"nand_register returned %i\", ret);\n+\t\tpr_err(\"nand_register returned %i\", ret);\n }\n \n #else /* defined(CONFIG_SPL_BUILD) */\ndiff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c\nindex 0042a7ba11df..6ab3c8a25add 100644\n--- a/drivers/mtd/nand/pxa3xx_nand.c\n+++ b/drivers/mtd/nand/pxa3xx_nand.c\n@@ -1559,7 +1559,7 @@ static int pxa3xx_nand_probe_dt(struct pxa3xx_nand_info *info)\n \n \t\tpdata->num_cs = fdtdec_get_int(blob, node, \"num-cs\", 1);\n \t\tif (pdata->num_cs != 1) {\n-\t\t\terror(\"pxa3xx driver supports single CS only\\n\");\n+\t\t\tpr_err(\"pxa3xx driver supports single CS only\\n\");\n \t\t\tbreak;\n \t\t}\n \ndiff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c\nindex 9ff72fa1edc7..a2b594ed739a 100644\n--- a/drivers/net/bcm-sf2-eth-gmac.c\n+++ b/drivers/net/bcm-sf2-eth-gmac.c\n@@ -610,7 +610,7 @@ int gmac_miiphy_read(struct mii_dev *bus, int phyaddr, int devad, int reg)\n \n \t/* Busy wait timeout is 1ms */\n \tif (gmac_mii_busywait(1000)) {\n-\t\terror(\"%s: Prepare MII read: MII/MDIO busy\\n\", __func__);\n+\t\tpr_err(\"%s: Prepare MII read: MII/MDIO busy\\n\", __func__);\n \t\treturn -1;\n \t}\n \n@@ -622,7 +622,7 @@ int gmac_miiphy_read(struct mii_dev *bus, int phyaddr, int devad, int reg)\n \twritel(tmp, GMAC_MII_DATA_ADDR);\n \n \tif (gmac_mii_busywait(1000)) {\n-\t\terror(\"%s: MII read failure: MII/MDIO busy\\n\", __func__);\n+\t\tpr_err(\"%s: MII read failure: MII/MDIO busy\\n\", __func__);\n \t\treturn -1;\n \t}\n \n@@ -638,7 +638,7 @@ int gmac_miiphy_write(struct mii_dev *bus, int phyaddr, int devad, int reg,\n \n \t/* Busy wait timeout is 1ms */\n \tif (gmac_mii_busywait(1000)) {\n-\t\terror(\"%s: Prepare MII write: MII/MDIO busy\\n\", __func__);\n+\t\tpr_err(\"%s: Prepare MII write: MII/MDIO busy\\n\", __func__);\n \t\treturn -1;\n \t}\n \n@@ -651,7 +651,7 @@ int gmac_miiphy_write(struct mii_dev *bus, int phyaddr, int devad, int reg,\n \twritel(tmp, GMAC_MII_DATA_ADDR);\n \n \tif (gmac_mii_busywait(1000)) {\n-\t\terror(\"%s: MII write failure: MII/MDIO busy\\n\", __func__);\n+\t\tpr_err(\"%s: MII write failure: MII/MDIO busy\\n\", __func__);\n \t\treturn -1;\n \t}\n \n@@ -742,7 +742,7 @@ int gmac_set_speed(int speed, int duplex)\n \t} else if (speed == 10) {\n \t\tspeed_cfg = 0;\n \t} else {\n-\t\terror(\"%s: Invalid GMAC speed(%d)!\\n\", __func__, speed);\n+\t\tpr_err(\"%s: Invalid GMAC speed(%d)!\\n\", __func__, speed);\n \t\treturn -1;\n \t}\n \n@@ -820,7 +820,7 @@ int gmac_mac_init(struct eth_device *dev)\n \twritel(0, GMAC0_INT_STATUS_ADDR);\n \n \tif (dma_init(dma) < 0) {\n-\t\terror(\"%s: GMAC dma_init failed\\n\", __func__);\n+\t\tpr_err(\"%s: GMAC dma_init failed\\n\", __func__);\n \t\tgoto err_exit;\n \t}\n \n@@ -855,7 +855,7 @@ int gmac_mac_init(struct eth_device *dev)\n \twritel(tmp, GMAC_MII_CTRL_ADDR);\n \n \tif (gmac_mii_busywait(1000)) {\n-\t\terror(\"%s: Configure MDIO: MII/MDIO busy\\n\", __func__);\n+\t\tpr_err(\"%s: Configure MDIO: MII/MDIO busy\\n\", __func__);\n \t\tgoto err_exit;\n \t}\n \ndiff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c\nindex e2747365a20b..9056f71b9ace 100644\n--- a/drivers/net/bcm-sf2-eth.c\n+++ b/drivers/net/bcm-sf2-eth.c\n@@ -40,7 +40,7 @@ static int bcm_sf2_eth_init(struct eth_device *dev)\n \n \trc = eth->mac_init(dev);\n \tif (rc) {\n-\t\terror(\"%s: Couldn't cofigure MAC!\\n\", __func__);\n+\t\tpr_err(\"%s: Couldn't cofigure MAC!\\n\", __func__);\n \t\treturn rc;\n \t}\n \n@@ -90,7 +90,7 @@ static int bcm_sf2_eth_send(struct eth_device *dev, void *packet, int length)\n \t\tdebug(\".\");\n \t\ti++;\n \t\tif (i > 20) {\n-\t\t\terror(\"%s: Tx timeout: retried 20 times\\n\", __func__);\n+\t\t\tpr_err(\"%s: Tx timeout: retried 20 times\\n\", __func__);\n \t\t\trc = -1;\n \t\t\tbreak;\n \t\t}\n@@ -117,7 +117,7 @@ static int bcm_sf2_eth_receive(struct eth_device *dev)\n \t\t\tdebug(\"\\nNO More Rx\\n\");\n \t\t\tbreak;\n \t\t} else if ((rcvlen == 0) || (rcvlen > RX_BUF_SIZE)) {\n-\t\t\terror(\"%s: Wrong Ethernet packet size (%d B), skip!\\n\",\n+\t\t\tpr_err(\"%s: Wrong Ethernet packet size (%d B), skip!\\n\",\n \t\t\t __func__, rcvlen);\n \t\t\tbreak;\n \t\t} else {\n@@ -166,9 +166,9 @@ static int bcm_sf2_eth_open(struct eth_device *dev, bd_t *bt)\n \t */\n \tfor (i = 0; i < eth->port_num; i++) {\n \t\tif (phy_startup(eth->port[i])) {\n-\t\t\terror(\"%s: PHY %d startup failed!\\n\", __func__, i);\n+\t\t\tpr_err(\"%s: PHY %d startup failed!\\n\", __func__, i);\n \t\t\tif (i == CONFIG_BCM_SF2_ETH_DEFAULT_PORT) {\n-\t\t\t\terror(\"%s: No default port %d!\\n\", __func__, i);\n+\t\t\t\tpr_err(\"%s: No default port %d!\\n\", __func__, i);\n \t\t\t\treturn -1;\n \t\t\t}\n \t\t}\n@@ -205,13 +205,13 @@ int bcm_sf2_eth_register(bd_t *bis, u8 dev_num)\n \n \tdev = (struct eth_device *)malloc(sizeof(struct eth_device));\n \tif (dev == NULL) {\n-\t\terror(\"%s: Not enough memory!\\n\", __func__);\n+\t\tpr_err(\"%s: Not enough memory!\\n\", __func__);\n \t\treturn -1;\n \t}\n \n \teth = (struct eth_info *)malloc(sizeof(struct eth_info));\n \tif (eth == NULL) {\n-\t\terror(\"%s: Not enough memory!\\n\", __func__);\n+\t\tpr_err(\"%s: Not enough memory!\\n\", __func__);\n \t\treturn -1;\n \t}\n \n@@ -234,7 +234,7 @@ int bcm_sf2_eth_register(bd_t *bis, u8 dev_num)\n \tif (gmac_add(dev)) {\n \t\tfree(eth);\n \t\tfree(dev);\n-\t\terror(\"%s: Adding GMAC failed!\\n\", __func__);\n+\t\tpr_err(\"%s: Adding GMAC failed!\\n\", __func__);\n \t\treturn -1;\n \t}\n #else\n@@ -263,7 +263,7 @@ int bcm_sf2_eth_register(bd_t *bis, u8 dev_num)\n \n \trc = bcm_sf2_eth_init(dev);\n \tif (rc != 0) {\n-\t\terror(\"%s: configuration failed!\\n\", __func__);\n+\t\tpr_err(\"%s: configuration failed!\\n\", __func__);\n \t\treturn -1;\n \t}\n \ndiff --git a/drivers/net/cpsw-common.c b/drivers/net/cpsw-common.c\nindex 8970ee00af30..0dc83ab82052 100644\n--- a/drivers/net/cpsw-common.c\n+++ b/drivers/net/cpsw-common.c\n@@ -29,14 +29,14 @@ static int davinci_emac_3517_get_macid(struct udevice *dev, u16 offset,\n \n \tsyscon = fdtdec_lookup_phandle(fdt, node, \"syscon\");\n \tif (syscon < 0) {\n-\t\terror(\"Syscon offset not found\\n\");\n+\t\tpr_err(\"Syscon offset not found\\n\");\n \t\treturn -ENOENT;\n \t}\n \n \taddr = (u32)map_physmem(fdt_translate_address(fdt, syscon, &gmii),\n \t\t\t\tsizeof(u32), MAP_NOCACHE);\n \tif (addr == FDT_ADDR_T_NONE) {\n-\t\terror(\"Not able to get syscon address to get mac efuse address\\n\");\n+\t\tpr_err(\"Not able to get syscon address to get mac efuse address\\n\");\n \t\treturn -ENOENT;\n \t}\n \n@@ -69,14 +69,14 @@ static int cpsw_am33xx_cm_get_macid(struct udevice *dev, u16 offset, int slave,\n \n \tsyscon = fdtdec_lookup_phandle(fdt, node, \"syscon\");\n \tif (syscon < 0) {\n-\t\terror(\"Syscon offset not found\\n\");\n+\t\tpr_err(\"Syscon offset not found\\n\");\n \t\treturn -ENOENT;\n \t}\n \n \taddr = (u32)map_physmem(fdt_translate_address(fdt, syscon, &gmii),\n \t\t\t\tsizeof(u32), MAP_NOCACHE);\n \tif (addr == FDT_ADDR_T_NONE) {\n-\t\terror(\"Not able to get syscon address to get mac efuse address\\n\");\n+\t\tpr_err(\"Not able to get syscon address to get mac efuse address\\n\");\n \t\treturn -ENOENT;\n \t}\n \ndiff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c\nindex d7db0fc432f7..b72258f83bfe 100644\n--- a/drivers/net/cpsw.c\n+++ b/drivers/net/cpsw.c\n@@ -1368,7 +1368,7 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)\n \n \t\t\tmdio_base = cpsw_get_addr_by_node(fdt, subnode);\n \t\t\tif (mdio_base == FDT_ADDR_T_NONE) {\n-\t\t\t\terror(\"Not able to get MDIO address space\\n\");\n+\t\t\t\tpr_err(\"Not able to get MDIO address space\\n\");\n \t\t\t\treturn -ENOENT;\n \t\t\t}\n \t\t\tpriv->data.mdio_base = mdio_base;\n@@ -1407,7 +1407,7 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)\n \t\t\t\t\t\t\t\t subnode);\n \n \t\t\tif (priv->data.gmii_sel == FDT_ADDR_T_NONE) {\n-\t\t\t\terror(\"Not able to get gmii_sel reg address\\n\");\n+\t\t\t\tpr_err(\"Not able to get gmii_sel reg address\\n\");\n \t\t\t\treturn -ENOENT;\n \t\t\t}\n \n@@ -1418,7 +1418,7 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)\n \t\t\tphy_sel_compat = fdt_getprop(fdt, subnode, \"compatible\",\n \t\t\t\t\t\t NULL);\n \t\t\tif (!phy_sel_compat) {\n-\t\t\t\terror(\"Not able to get gmii_sel compatible\\n\");\n+\t\t\t\tpr_err(\"Not able to get gmii_sel compatible\\n\");\n \t\t\t\treturn -ENOENT;\n \t\t\t}\n \t\t}\n@@ -1434,7 +1434,7 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)\n \n \tret = ti_cm_get_macid(dev, active_slave, pdata->enetaddr);\n \tif (ret < 0) {\n-\t\terror(\"cpsw read efuse mac failed\\n\");\n+\t\tpr_err(\"cpsw read efuse mac failed\\n\");\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c\nindex 5c4315ffeaad..00076cffbed2 100644\n--- a/drivers/net/dwc_eth_qos.c\n+++ b/drivers/net/dwc_eth_qos.c\n@@ -377,7 +377,7 @@ static int eqos_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,\n \n \tret = eqos_mdio_wait_idle(eqos);\n \tif (ret) {\n-\t\terror(\"MDIO not idle at entry\");\n+\t\tpr_err(\"MDIO not idle at entry\");\n \t\treturn ret;\n \t}\n \n@@ -397,7 +397,7 @@ static int eqos_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,\n \n \tret = eqos_mdio_wait_idle(eqos);\n \tif (ret) {\n-\t\terror(\"MDIO read didn't complete\");\n+\t\tpr_err(\"MDIO read didn't complete\");\n \t\treturn ret;\n \t}\n \n@@ -421,7 +421,7 @@ static int eqos_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,\n \n \tret = eqos_mdio_wait_idle(eqos);\n \tif (ret) {\n-\t\terror(\"MDIO not idle at entry\");\n+\t\tpr_err(\"MDIO not idle at entry\");\n \t\treturn ret;\n \t}\n \n@@ -443,7 +443,7 @@ static int eqos_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,\n \n \tret = eqos_mdio_wait_idle(eqos);\n \tif (ret) {\n-\t\terror(\"MDIO read didn't complete\");\n+\t\tpr_err(\"MDIO read didn't complete\");\n \t\treturn ret;\n \t}\n \n@@ -459,37 +459,37 @@ static int eqos_start_clks_tegra186(struct udevice *dev)\n \n \tret = clk_enable(&eqos->clk_slave_bus);\n \tif (ret < 0) {\n-\t\terror(\"clk_enable(clk_slave_bus) failed: %d\", ret);\n+\t\tpr_err(\"clk_enable(clk_slave_bus) failed: %d\", ret);\n \t\tgoto err;\n \t}\n \n \tret = clk_enable(&eqos->clk_master_bus);\n \tif (ret < 0) {\n-\t\terror(\"clk_enable(clk_master_bus) failed: %d\", ret);\n+\t\tpr_err(\"clk_enable(clk_master_bus) failed: %d\", ret);\n \t\tgoto err_disable_clk_slave_bus;\n \t}\n \n \tret = clk_enable(&eqos->clk_rx);\n \tif (ret < 0) {\n-\t\terror(\"clk_enable(clk_rx) failed: %d\", ret);\n+\t\tpr_err(\"clk_enable(clk_rx) failed: %d\", ret);\n \t\tgoto err_disable_clk_master_bus;\n \t}\n \n \tret = clk_enable(&eqos->clk_ptp_ref);\n \tif (ret < 0) {\n-\t\terror(\"clk_enable(clk_ptp_ref) failed: %d\", ret);\n+\t\tpr_err(\"clk_enable(clk_ptp_ref) failed: %d\", ret);\n \t\tgoto err_disable_clk_rx;\n \t}\n \n \tret = clk_set_rate(&eqos->clk_ptp_ref, 125 * 1000 * 1000);\n \tif (ret < 0) {\n-\t\terror(\"clk_set_rate(clk_ptp_ref) failed: %d\", ret);\n+\t\tpr_err(\"clk_set_rate(clk_ptp_ref) failed: %d\", ret);\n \t\tgoto err_disable_clk_ptp_ref;\n \t}\n \n \tret = clk_enable(&eqos->clk_tx);\n \tif (ret < 0) {\n-\t\terror(\"clk_enable(clk_tx) failed: %d\", ret);\n+\t\tpr_err(\"clk_enable(clk_tx) failed: %d\", ret);\n \t\tgoto err_disable_clk_ptp_ref;\n \t}\n \n@@ -533,7 +533,7 @@ static int eqos_start_resets_tegra186(struct udevice *dev)\n \n \tret = dm_gpio_set_value(&eqos->phy_reset_gpio, 1);\n \tif (ret < 0) {\n-\t\terror(\"dm_gpio_set_value(phy_reset, assert) failed: %d\", ret);\n+\t\tpr_err(\"dm_gpio_set_value(phy_reset, assert) failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n@@ -541,13 +541,13 @@ static int eqos_start_resets_tegra186(struct udevice *dev)\n \n \tret = dm_gpio_set_value(&eqos->phy_reset_gpio, 0);\n \tif (ret < 0) {\n-\t\terror(\"dm_gpio_set_value(phy_reset, deassert) failed: %d\", ret);\n+\t\tpr_err(\"dm_gpio_set_value(phy_reset, deassert) failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n \tret = reset_assert(&eqos->reset_ctl);\n \tif (ret < 0) {\n-\t\terror(\"reset_assert() failed: %d\", ret);\n+\t\tpr_err(\"reset_assert() failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n@@ -555,7 +555,7 @@ static int eqos_start_resets_tegra186(struct udevice *dev)\n \n \tret = reset_deassert(&eqos->reset_ctl);\n \tif (ret < 0) {\n-\t\terror(\"reset_deassert() failed: %d\", ret);\n+\t\tpr_err(\"reset_deassert() failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n@@ -591,14 +591,14 @@ static int eqos_calibrate_pads_tegra186(struct udevice *dev)\n \tret = wait_for_bit(__func__, &eqos->tegra186_regs->auto_cal_status,\n \t\t\t EQOS_AUTO_CAL_STATUS_ACTIVE, true, 10, false);\n \tif (ret) {\n-\t\terror(\"calibrate didn't start\");\n+\t\tpr_err(\"calibrate didn't start\");\n \t\tgoto failed;\n \t}\n \n \tret = wait_for_bit(__func__, &eqos->tegra186_regs->auto_cal_status,\n \t\t\t EQOS_AUTO_CAL_STATUS_ACTIVE, false, 10, false);\n \tif (ret) {\n-\t\terror(\"calibrate didn't finish\");\n+\t\tpr_err(\"calibrate didn't finish\");\n \t\tgoto failed;\n \t}\n \n@@ -713,13 +713,13 @@ static int eqos_set_tx_clk_speed_tegra186(struct udevice *dev)\n \t\trate = 2.5 * 1000 * 1000;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"invalid speed %d\", eqos->phy->speed);\n+\t\tpr_err(\"invalid speed %d\", eqos->phy->speed);\n \t\treturn -EINVAL;\n \t}\n \n \tret = clk_set_rate(&eqos->clk_tx, rate);\n \tif (ret < 0) {\n-\t\terror(\"clk_set_rate(tx_clk, %lu) failed: %d\", rate, ret);\n+\t\tpr_err(\"clk_set_rate(tx_clk, %lu) failed: %d\", rate, ret);\n \t\treturn ret;\n \t}\n \n@@ -739,7 +739,7 @@ static int eqos_adjust_link(struct udevice *dev)\n \telse\n \t\tret = eqos_set_half_duplex(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_set_*_duplex() failed: %d\", ret);\n+\t\tpr_err(\"eqos_set_*_duplex() failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n@@ -757,24 +757,24 @@ static int eqos_adjust_link(struct udevice *dev)\n \t\tret = eqos_set_mii_speed_10(dev);\n \t\tbreak;\n \tdefault:\n-\t\terror(\"invalid speed %d\", eqos->phy->speed);\n+\t\tpr_err(\"invalid speed %d\", eqos->phy->speed);\n \t\treturn -EINVAL;\n \t}\n \tif (ret < 0) {\n-\t\terror(\"eqos_set_*mii_speed*() failed: %d\", ret);\n+\t\tpr_err(\"eqos_set_*mii_speed*() failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n \tif (en_calibration) {\n \t\tret = eqos_calibrate_pads_tegra186(dev);\n \t\tif (ret < 0) {\n-\t\t\terror(\"eqos_calibrate_pads_tegra186() failed: %d\", ret);\n+\t\t\tpr_err(\"eqos_calibrate_pads_tegra186() failed: %d\", ret);\n \t\t\treturn ret;\n \t\t}\n \t} else {\n \t\tret = eqos_disable_calibration_tegra186(dev);\n \t\tif (ret < 0) {\n-\t\t\terror(\"eqos_disable_calibration_tegra186() failed: %d\",\n+\t\t\tpr_err(\"eqos_disable_calibration_tegra186() failed: %d\",\n \t\t\t ret);\n \t\t\treturn ret;\n \t\t}\n@@ -782,7 +782,7 @@ static int eqos_adjust_link(struct udevice *dev)\n \n \tret = eqos_set_tx_clk_speed_tegra186(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_set_tx_clk_speed_tegra186() failed: %d\", ret);\n+\t\tpr_err(\"eqos_set_tx_clk_speed_tegra186() failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n@@ -848,13 +848,13 @@ static int eqos_start(struct udevice *dev)\n \n \tret = eqos_start_clks_tegra186(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_start_clks_tegra186() failed: %d\", ret);\n+\t\tpr_err(\"eqos_start_clks_tegra186() failed: %d\", ret);\n \t\tgoto err;\n \t}\n \n \tret = eqos_start_resets_tegra186(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_start_resets_tegra186() failed: %d\", ret);\n+\t\tpr_err(\"eqos_start_resets_tegra186() failed: %d\", ret);\n \t\tgoto err_stop_clks;\n \t}\n \n@@ -865,13 +865,13 @@ static int eqos_start(struct udevice *dev)\n \tret = wait_for_bit(__func__, &eqos->dma_regs->mode,\n \t\t\t EQOS_DMA_MODE_SWR, false, 10, false);\n \tif (ret) {\n-\t\terror(\"EQOS_DMA_MODE_SWR stuck\");\n+\t\tpr_err(\"EQOS_DMA_MODE_SWR stuck\");\n \t\tgoto err_stop_resets;\n \t}\n \n \tret = eqos_calibrate_pads_tegra186(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_calibrate_pads_tegra186() failed: %d\", ret);\n+\t\tpr_err(\"eqos_calibrate_pads_tegra186() failed: %d\", ret);\n \t\tgoto err_stop_resets;\n \t}\n \n@@ -881,28 +881,28 @@ static int eqos_start(struct udevice *dev)\n \n \teqos->phy = phy_connect(eqos->mii, 0, dev, 0);\n \tif (!eqos->phy) {\n-\t\terror(\"phy_connect() failed\");\n+\t\tpr_err(\"phy_connect() failed\");\n \t\tgoto err_stop_resets;\n \t}\n \tret = phy_config(eqos->phy);\n \tif (ret < 0) {\n-\t\terror(\"phy_config() failed: %d\", ret);\n+\t\tpr_err(\"phy_config() failed: %d\", ret);\n \t\tgoto err_shutdown_phy;\n \t}\n \tret = phy_startup(eqos->phy);\n \tif (ret < 0) {\n-\t\terror(\"phy_startup() failed: %d\", ret);\n+\t\tpr_err(\"phy_startup() failed: %d\", ret);\n \t\tgoto err_shutdown_phy;\n \t}\n \n \tif (!eqos->phy->link) {\n-\t\terror(\"No link\");\n+\t\tpr_err(\"No link\");\n \t\tgoto err_shutdown_phy;\n \t}\n \n \tret = eqos_adjust_link(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_adjust_link() failed: %d\", ret);\n+\t\tpr_err(\"eqos_adjust_link() failed: %d\", ret);\n \t\tgoto err_shutdown_phy;\n \t}\n \n@@ -1119,7 +1119,7 @@ err_stop_resets:\n err_stop_clks:\n \teqos_stop_clks_tegra186(dev);\n err:\n-\terror(\"FAILED: %d\", ret);\n+\tpr_err(\"FAILED: %d\", ret);\n \treturn ret;\n }\n \n@@ -1361,7 +1361,7 @@ static int eqos_probe_resources_tegra186(struct udevice *dev)\n \n \tret = reset_get_by_name(dev, \"eqos\", &eqos->reset_ctl);\n \tif (ret) {\n-\t\terror(\"reset_get_by_name(rst) failed: %d\", ret);\n+\t\tpr_err(\"reset_get_by_name(rst) failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n@@ -1369,38 +1369,38 @@ static int eqos_probe_resources_tegra186(struct udevice *dev)\n \t\t\t\t &eqos->phy_reset_gpio,\n \t\t\t\t GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);\n \tif (ret) {\n-\t\terror(\"gpio_request_by_name(phy reset) failed: %d\", ret);\n+\t\tpr_err(\"gpio_request_by_name(phy reset) failed: %d\", ret);\n \t\tgoto err_free_reset_eqos;\n \t}\n \n \tret = clk_get_by_name(dev, \"slave_bus\", &eqos->clk_slave_bus);\n \tif (ret) {\n-\t\terror(\"clk_get_by_name(slave_bus) failed: %d\", ret);\n+\t\tpr_err(\"clk_get_by_name(slave_bus) failed: %d\", ret);\n \t\tgoto err_free_gpio_phy_reset;\n \t}\n \n \tret = clk_get_by_name(dev, \"master_bus\", &eqos->clk_master_bus);\n \tif (ret) {\n-\t\terror(\"clk_get_by_name(master_bus) failed: %d\", ret);\n+\t\tpr_err(\"clk_get_by_name(master_bus) failed: %d\", ret);\n \t\tgoto err_free_clk_slave_bus;\n \t}\n \n \tret = clk_get_by_name(dev, \"rx\", &eqos->clk_rx);\n \tif (ret) {\n-\t\terror(\"clk_get_by_name(rx) failed: %d\", ret);\n+\t\tpr_err(\"clk_get_by_name(rx) failed: %d\", ret);\n \t\tgoto err_free_clk_master_bus;\n \t}\n \n \tret = clk_get_by_name(dev, \"ptp_ref\", &eqos->clk_ptp_ref);\n \tif (ret) {\n-\t\terror(\"clk_get_by_name(ptp_ref) failed: %d\", ret);\n+\t\tpr_err(\"clk_get_by_name(ptp_ref) failed: %d\", ret);\n \t\tgoto err_free_clk_rx;\n \t\treturn ret;\n \t}\n \n \tret = clk_get_by_name(dev, \"tx\", &eqos->clk_tx);\n \tif (ret) {\n-\t\terror(\"clk_get_by_name(tx) failed: %d\", ret);\n+\t\tpr_err(\"clk_get_by_name(tx) failed: %d\", ret);\n \t\tgoto err_free_clk_ptp_ref;\n \t}\n \n@@ -1454,7 +1454,7 @@ static int eqos_probe(struct udevice *dev)\n \n \teqos->regs = devfdt_get_addr(dev);\n \tif (eqos->regs == FDT_ADDR_T_NONE) {\n-\t\terror(\"devfdt_get_addr() failed\");\n+\t\tpr_err(\"devfdt_get_addr() failed\");\n \t\treturn -ENODEV;\n \t}\n \teqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE);\n@@ -1464,19 +1464,19 @@ static int eqos_probe(struct udevice *dev)\n \n \tret = eqos_probe_resources_core(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_probe_resources_core() failed: %d\", ret);\n+\t\tpr_err(\"eqos_probe_resources_core() failed: %d\", ret);\n \t\treturn ret;\n \t}\n \n \tret = eqos_probe_resources_tegra186(dev);\n \tif (ret < 0) {\n-\t\terror(\"eqos_probe_resources_tegra186() failed: %d\", ret);\n+\t\tpr_err(\"eqos_probe_resources_tegra186() failed: %d\", ret);\n \t\tgoto err_remove_resources_core;\n \t}\n \n \teqos->mii = mdio_alloc();\n \tif (!eqos->mii) {\n-\t\terror(\"mdio_alloc() failed\");\n+\t\tpr_err(\"mdio_alloc() failed\");\n \t\tgoto err_remove_resources_tegra;\n \t}\n \teqos->mii->read = eqos_mdio_read;\n@@ -1486,7 +1486,7 @@ static int eqos_probe(struct udevice *dev)\n \n \tret = mdio_register(eqos->mii);\n \tif (ret < 0) {\n-\t\terror(\"mdio_register() failed: %d\", ret);\n+\t\tpr_err(\"mdio_register() failed: %d\", ret);\n \t\tgoto err_free_mdio;\n \t}\n \ndiff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c\nindex a94191b9e671..bc4570624332 100644\n--- a/drivers/net/ep93xx_eth.c\n+++ b/drivers/net/ep93xx_eth.c\n@@ -324,7 +324,7 @@ static int ep93xx_eth_rcv_packet(struct eth_device *dev)\n \t\t\tdebug(\"reporting %d bytes...\\n\", len);\n \t\t} else {\n \t\t\t/* Do we have an erroneous packet? */\n-\t\t\terror(\"packet rx error, status %08X %08X\",\n+\t\t\tpr_err(\"packet rx error, status %08X %08X\",\n \t\t\t\tpriv->rx_sq.current->word1,\n \t\t\t\tpriv->rx_sq.current->word2);\n \t\t\tdump_rx_descriptor_queue(dev);\n@@ -401,7 +401,7 @@ static int ep93xx_eth_send_packet(struct eth_device *dev,\n \t\t; /* noop */\n \n \tif (!TX_STATUS_TXWE(priv->tx_sq.current)) {\n-\t\terror(\"packet tx error, status %08X\",\n+\t\tpr_err(\"packet tx error, status %08X\",\n \t\t\tpriv->tx_sq.current->word1);\n \t\tdump_tx_descriptor_queue(dev);\n \t\tdump_tx_status_queue(dev);\n@@ -452,7 +452,7 @@ int ep93xx_eth_initialize(u8 dev_num, int base_addr)\n \n \tpriv = malloc(sizeof(*priv));\n \tif (!priv) {\n-\t\terror(\"malloc() failed\");\n+\t\tpr_err(\"malloc() failed\");\n \t\tgoto eth_init_failed_0;\n \t}\n \tmemset(priv, 0, sizeof(*priv));\n@@ -462,34 +462,34 @@ int ep93xx_eth_initialize(u8 dev_num, int base_addr)\n \tpriv->tx_dq.base = calloc(NUMTXDESC,\n \t\t\t\tsizeof(struct tx_descriptor));\n \tif (priv->tx_dq.base == NULL) {\n-\t\terror(\"calloc() failed\");\n+\t\tpr_err(\"calloc() failed\");\n \t\tgoto eth_init_failed_1;\n \t}\n \n \tpriv->tx_sq.base = calloc(NUMTXDESC,\n \t\t\t\tsizeof(struct tx_status));\n \tif (priv->tx_sq.base == NULL) {\n-\t\terror(\"calloc() failed\");\n+\t\tpr_err(\"calloc() failed\");\n \t\tgoto eth_init_failed_2;\n \t}\n \n \tpriv->rx_dq.base = calloc(NUMRXDESC,\n \t\t\t\tsizeof(struct rx_descriptor));\n \tif (priv->rx_dq.base == NULL) {\n-\t\terror(\"calloc() failed\");\n+\t\tpr_err(\"calloc() failed\");\n \t\tgoto eth_init_failed_3;\n \t}\n \n \tpriv->rx_sq.base = calloc(NUMRXDESC,\n \t\t\t\tsizeof(struct rx_status));\n \tif (priv->rx_sq.base == NULL) {\n-\t\terror(\"calloc() failed\");\n+\t\tpr_err(\"calloc() failed\");\n \t\tgoto eth_init_failed_4;\n \t}\n \n \tdev = malloc(sizeof *dev);\n \tif (dev == NULL) {\n-\t\terror(\"malloc() failed\");\n+\t\tpr_err(\"malloc() failed\");\n \t\tgoto eth_init_failed_5;\n \t}\n \tmemset(dev, 0, sizeof *dev);\ndiff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c\nindex 72ef42cca883..21ccab47ae27 100644\n--- a/drivers/net/keystone_net.c\n+++ b/drivers/net/keystone_net.c\n@@ -757,7 +757,7 @@ static int ks2_eth_start(struct udevice *dev)\n \tqm_init();\n \n \tif (ksnav_init(priv->netcp_pktdma, &priv->net_rx_buffs)) {\n-\t\terror(\"ksnav_init failed\\n\");\n+\t\tpr_err(\"ksnav_init failed\\n\");\n \t\tgoto err_knav_init;\n \t}\n \n@@ -773,7 +773,7 @@ static int ks2_eth_start(struct udevice *dev)\n \n \t\tphy_startup(priv->phydev);\n \t\tif (priv->phydev->link == 0) {\n-\t\t\terror(\"phy startup failed\\n\");\n+\t\t\tpr_err(\"phy startup failed\\n\");\n \t\t\tgoto err_phy_start;\n \t\t}\n \t}\n@@ -923,7 +923,7 @@ static int ks2_eth_probe(struct udevice *dev)\n \t\t */\n \t\tmdio_bus = mdio_alloc();\n \t\tif (!mdio_bus) {\n-\t\t\terror(\"MDIO alloc failed\\n\");\n+\t\t\tpr_err(\"MDIO alloc failed\\n\");\n \t\t\treturn -ENOMEM;\n \t\t}\n \t\tpriv->mdio_bus = mdio_bus;\n@@ -935,7 +935,7 @@ static int ks2_eth_probe(struct udevice *dev)\n \n \t\tret = mdio_register(mdio_bus);\n \t\tif (ret) {\n-\t\t\terror(\"MDIO bus register failed\\n\");\n+\t\t\tpr_err(\"MDIO bus register failed\\n\");\n \t\t\treturn ret;\n \t\t}\n \t} else {\n@@ -1011,7 +1011,7 @@ static int ks2_eth_bind_slaves(struct udevice *dev, int gbe, int *gbe_0)\n \t\t\t\t\tslave_name, offset_to_ofnode(slave),\n \t\t\t\t\t&sl_dev);\n \t\t\tif (ret) {\n-\t\t\t\terror(\"ks2_net - not able to bind slave interfaces\\n\");\n+\t\t\t\tpr_err(\"ks2_net - not able to bind slave interfaces\\n\");\n \t\t\t\treturn ret;\n \t\t\t}\n \t\t}\n@@ -1031,7 +1031,7 @@ static int ks2_eth_bind_slaves(struct udevice *dev, int gbe, int *gbe_0)\n \t\tret = device_bind_driver_to_node(dev, \"eth_ks2_sl\", slave_name,\n \t\t\t\t\toffset_to_ofnode(slave), &sl_dev);\n \t\tif (ret) {\n-\t\t\terror(\"ks2_net - not able to bind slave interfaces\\n\");\n+\t\t\tpr_err(\"ks2_net - not able to bind slave interfaces\\n\");\n \t\t\treturn ret;\n \t\t}\n \t}\n@@ -1074,7 +1074,7 @@ static int ks2_eth_parse_slave_interface(int netcp, int slave,\n \n \t\tmdio = fdt_parent_offset(fdt, phy);\n \t\tif (mdio < 0) {\n-\t\t\terror(\"mdio dt not found\\n\");\n+\t\t\tpr_err(\"mdio dt not found\\n\");\n \t\t\treturn -ENODEV;\n \t\t}\n \t\tpriv->mdio_base = (void *)fdtdec_get_addr(fdt, mdio, \"reg\");\ndiff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c\nindex cb5cf8b043bd..c15d84b4c2df 100644\n--- a/drivers/pci/pci_tegra.c\n+++ b/drivers/pci/pci_tegra.c\n@@ -371,7 +371,7 @@ static int tegra_pcie_port_parse_dt(ofnode node, struct tegra_pcie_port *port)\n \n \taddr = ofnode_get_property(node, \"assigned-addresses\", &len);\n \tif (!addr) {\n-\t\terror(\"property \\\"assigned-addresses\\\" not found\");\n+\t\tpr_err(\"property \\\"assigned-addresses\\\" not found\");\n \t\treturn -FDT_ERR_NOTFOUND;\n \t}\n \n@@ -462,7 +462,7 @@ static int tegra_pcie_parse_port_info(ofnode node, uint *index, uint *lanes)\n \n \terr = ofnode_read_u32_default(node, \"nvidia,num-lanes\", -1);\n \tif (err < 0) {\n-\t\terror(\"failed to parse \\\"nvidia,num-lanes\\\" property\");\n+\t\tpr_err(\"failed to parse \\\"nvidia,num-lanes\\\" property\");\n \t\treturn err;\n \t}\n \n@@ -470,7 +470,7 @@ static int tegra_pcie_parse_port_info(ofnode node, uint *index, uint *lanes)\n \n \terr = ofnode_read_pci_addr(node, 0, \"reg\", &addr);\n \tif (err < 0) {\n-\t\terror(\"failed to parse \\\"reg\\\" property\");\n+\t\tpr_err(\"failed to parse \\\"reg\\\" property\");\n \t\treturn err;\n \t}\n \n@@ -493,25 +493,25 @@ static int tegra_pcie_parse_dt(struct udevice *dev, enum tegra_pci_id id,\n \n \terr = dev_read_resource(dev, 0, &pcie->pads);\n \tif (err < 0) {\n-\t\terror(\"resource \\\"pads\\\" not found\");\n+\t\tpr_err(\"resource \\\"pads\\\" not found\");\n \t\treturn err;\n \t}\n \n \terr = dev_read_resource(dev, 1, &pcie->afi);\n \tif (err < 0) {\n-\t\terror(\"resource \\\"afi\\\" not found\");\n+\t\tpr_err(\"resource \\\"afi\\\" not found\");\n \t\treturn err;\n \t}\n \n \terr = dev_read_resource(dev, 2, &pcie->cs);\n \tif (err < 0) {\n-\t\terror(\"resource \\\"cs\\\" not found\");\n+\t\tpr_err(\"resource \\\"cs\\\" not found\");\n \t\treturn err;\n \t}\n \n \terr = tegra_pcie_board_init();\n \tif (err < 0) {\n-\t\terror(\"tegra_pcie_board_init() failed: err=%d\", err);\n+\t\tpr_err(\"tegra_pcie_board_init() failed: err=%d\", err);\n \t\treturn err;\n \t}\n \n@@ -520,7 +520,7 @@ static int tegra_pcie_parse_dt(struct udevice *dev, enum tegra_pci_id id,\n \tif (pcie->phy) {\n \t\terr = tegra_xusb_phy_prepare(pcie->phy);\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to prepare PHY: %d\", err);\n+\t\t\tpr_err(\"failed to prepare PHY: %d\", err);\n \t\t\treturn err;\n \t\t}\n \t}\n@@ -532,7 +532,7 @@ static int tegra_pcie_parse_dt(struct udevice *dev, enum tegra_pci_id id,\n \n \t\terr = tegra_pcie_parse_port_info(subnode, &index, &num_lanes);\n \t\tif (err < 0) {\n-\t\t\terror(\"failed to obtain root port info\");\n+\t\t\tpr_err(\"failed to obtain root port info\");\n \t\t\tcontinue;\n \t\t}\n \n@@ -562,7 +562,7 @@ static int tegra_pcie_parse_dt(struct udevice *dev, enum tegra_pci_id id,\n \terr = tegra_pcie_get_xbar_config(dev_ofnode(dev), lanes, id,\n \t\t\t\t\t &pcie->xbar);\n \tif (err < 0) {\n-\t\terror(\"invalid lane configuration\");\n+\t\tpr_err(\"invalid lane configuration\");\n \t\treturn err;\n \t}\n \n@@ -576,31 +576,31 @@ static int tegra_pcie_power_on(struct tegra_pcie *pcie)\n \n \tret = power_domain_on(&pcie->pwrdom);\n \tif (ret) {\n-\t\terror(\"power_domain_on() failed: %d\\n\", ret);\n+\t\tpr_err(\"power_domain_on() failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \tret = clk_enable(&pcie->clk_afi);\n \tif (ret) {\n-\t\terror(\"clk_enable(afi) failed: %d\\n\", ret);\n+\t\tpr_err(\"clk_enable(afi) failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \tret = clk_enable(&pcie->clk_pex);\n \tif (ret) {\n-\t\terror(\"clk_enable(pex) failed: %d\\n\", ret);\n+\t\tpr_err(\"clk_enable(pex) failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \tret = reset_deassert(&pcie->reset_afi);\n \tif (ret) {\n-\t\terror(\"reset_deassert(afi) failed: %d\\n\", ret);\n+\t\tpr_err(\"reset_deassert(afi) failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n \tret = reset_deassert(&pcie->reset_pex);\n \tif (ret) {\n-\t\terror(\"reset_deassert(pex) failed: %d\\n\", ret);\n+\t\tpr_err(\"reset_deassert(pex) failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -620,14 +620,14 @@ static int tegra_pcie_power_on(struct tegra_pcie *pcie)\n \n \terr = tegra_powergate_power_off(TEGRA_POWERGATE_PCIE);\n \tif (err < 0) {\n-\t\terror(\"failed to power off PCIe partition: %d\", err);\n+\t\tpr_err(\"failed to power off PCIe partition: %d\", err);\n \t\treturn err;\n \t}\n \n \terr = tegra_powergate_sequence_power_up(TEGRA_POWERGATE_PCIE,\n \t\t\t\t\t\tPERIPH_ID_PCIE);\n \tif (err < 0) {\n-\t\terror(\"failed to power up PCIe partition: %d\", err);\n+\t\tpr_err(\"failed to power up PCIe partition: %d\", err);\n \t\treturn err;\n \t}\n \n@@ -647,7 +647,7 @@ static int tegra_pcie_power_on(struct tegra_pcie *pcie)\n \n \terr = tegra_plle_enable();\n \tif (err < 0) {\n-\t\terror(\"failed to enable PLLE: %d\\n\", err);\n+\t\tpr_err(\"failed to enable PLLE: %d\\n\", err);\n \t\treturn err;\n \t}\n \n@@ -707,7 +707,7 @@ static int tegra_pcie_phy_enable(struct tegra_pcie *pcie)\n \t/* wait for the PLL to lock */\n \terr = tegra_pcie_pll_wait(pcie, 500);\n \tif (err < 0) {\n-\t\terror(\"PLL failed to lock: %d\", err);\n+\t\tpr_err(\"PLL failed to lock: %d\", err);\n \t\treturn err;\n \t}\n \n@@ -771,7 +771,7 @@ static int tegra_pcie_enable_controller(struct tegra_pcie *pcie)\n \t\terr = tegra_pcie_phy_enable(pcie);\n \n \tif (err < 0) {\n-\t\terror(\"failed to power on PHY: %d\\n\", err);\n+\t\tpr_err(\"failed to power on PHY: %d\\n\", err);\n \t\treturn err;\n \t}\n #endif\n@@ -780,7 +780,7 @@ static int tegra_pcie_enable_controller(struct tegra_pcie *pcie)\n #ifdef CONFIG_TEGRA186\n \terr = reset_deassert(&pcie->reset_pcie_x);\n \tif (err) {\n-\t\terror(\"reset_deassert(pcie_x) failed: %d\\n\", err);\n+\t\tpr_err(\"reset_deassert(pcie_x) failed: %d\\n\", err);\n \t\treturn err;\n \t}\n #else\n@@ -1145,25 +1145,25 @@ static int pci_tegra_probe(struct udevice *dev)\n \n \terr = tegra_pcie_power_on(pcie);\n \tif (err < 0) {\n-\t\terror(\"failed to power on\");\n+\t\tpr_err(\"failed to power on\");\n \t\treturn err;\n \t}\n \n \terr = tegra_pcie_enable_controller(pcie);\n \tif (err < 0) {\n-\t\terror(\"failed to enable controller\");\n+\t\tpr_err(\"failed to enable controller\");\n \t\treturn err;\n \t}\n \n \terr = tegra_pcie_setup_translations(dev);\n \tif (err < 0) {\n-\t\terror(\"failed to decode ranges\");\n+\t\tpr_err(\"failed to decode ranges\");\n \t\treturn err;\n \t}\n \n \terr = tegra_pcie_enable(pcie);\n \tif (err < 0) {\n-\t\terror(\"failed to enable PCIe\");\n+\t\tpr_err(\"failed to enable PCIe\");\n \t\treturn err;\n \t}\n \ndiff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c\nindex 08e2e9344583..6b8b96a73432 100644\n--- a/drivers/pci/pcie_xilinx.c\n+++ b/drivers/pci/pcie_xilinx.c\n@@ -189,7 +189,7 @@ static int pcie_xilinx_ofdata_to_platdata(struct udevice *dev)\n \terr = fdt_get_resource(gd->fdt_blob, dev_of_offset(dev), \"reg\",\n \t\t\t 0, ®_res);\n \tif (err < 0) {\n-\t\terror(\"\\\"reg\\\" resource not found\\n\");\n+\t\tpr_err(\"\\\"reg\\\" resource not found\\n\");\n \t\treturn err;\n \t}\n \ndiff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c\nindex 3ac405a9be6e..37187885fa05 100644\n--- a/drivers/phy/marvell/comphy_cp110.c\n+++ b/drivers/phy/marvell/comphy_cp110.c\n@@ -509,7 +509,7 @@ static int comphy_pcie_power_up(u32 lane, u32 pcie_width, bool clk_src,\n \t\t\t\tdebug(\"Read from reg = %p - value = 0x%x\\n\",\n \t\t\t\t hpipe_addr + HPIPE_LANE_STATUS1_REG,\n \t\t\t\t data);\n-\t\t\t\terror(\"HPIPE_LANE_STATUS1_PCLK_EN_MASK is 0\\n\");\n+\t\t\t\tpr_err(\"HPIPE_LANE_STATUS1_PCLK_EN_MASK is 0\\n\");\n \t\t\t\tret = 0;\n \t\t\t}\n \t\t}\n@@ -633,7 +633,7 @@ static int comphy_usb3_power_up(u32 lane, void __iomem *hpipe_base,\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\",\n \t\t hpipe_addr + HPIPE_LANE_STATUS1_REG, data);\n-\t\terror(\"HPIPE_LANE_STATUS1_PCLK_EN_MASK is 0\\n\");\n+\t\tpr_err(\"HPIPE_LANE_STATUS1_PCLK_EN_MASK is 0\\n\");\n \t\tret = 0;\n \t}\n \n@@ -666,14 +666,14 @@ static int comphy_sata_power_up(u32 lane, void __iomem *hpipe_base,\n \t\t\tgd->fdt_blob, sata_node, \"marvell,armada-8k-ahci\");\n \n \tif (sata_node == 0) {\n-\t\terror(\"SATA node not found in FDT\\n\");\n+\t\tpr_err(\"SATA node not found in FDT\\n\");\n \t\treturn 0;\n \t}\n \n \tsata_base = (void __iomem *)fdtdec_get_addr_size_auto_noparent(\n \t\tgd->fdt_blob, sata_node, \"reg\", 0, NULL, true);\n \tif (sata_base == NULL) {\n-\t\terror(\"SATA address not found in FDT\\n\");\n+\t\tpr_err(\"SATA address not found in FDT\\n\");\n \t\treturn 0;\n \t}\n \n@@ -976,7 +976,7 @@ static int comphy_sata_power_up(u32 lane, void __iomem *hpipe_base,\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\",\n \t\t hpipe_addr + HPIPE_LANE_STATUS1_REG, data);\n-\t\terror(\"SD_EXTERNAL_STATUS0_PLL_TX is %d, SD_EXTERNAL_STATUS0_PLL_RX is %d\\n\",\n+\t\tpr_err(\"SD_EXTERNAL_STATUS0_PLL_TX is %d, SD_EXTERNAL_STATUS0_PLL_RX is %d\\n\",\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_TX_MASK),\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_RX_MASK));\n \t\tret = 0;\n@@ -1099,7 +1099,7 @@ static int comphy_sgmii_power_up(u32 lane, u32 sgmii_speed,\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\",\n \t\t sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);\n-\t\terror(\"SD_EXTERNAL_STATUS0_PLL_RX is %d, SD_EXTERNAL_STATUS0_PLL_TX is %d\\n\",\n+\t\tpr_err(\"SD_EXTERNAL_STATUS0_PLL_RX is %d, SD_EXTERNAL_STATUS0_PLL_TX is %d\\n\",\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_RX_MASK),\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_TX_MASK));\n \t\tret = 0;\n@@ -1117,7 +1117,7 @@ static int comphy_sgmii_power_up(u32 lane, u32 sgmii_speed,\n \tdata = polling_with_timeout(addr, data, mask, 100);\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\", sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);\n-\t\terror(\"SD_EXTERNAL_STATUS0_RX_INIT is 0\\n\");\n+\t\tpr_err(\"SD_EXTERNAL_STATUS0_RX_INIT is 0\\n\");\n \t\tret = 0;\n \t}\n \n@@ -1398,7 +1398,7 @@ static int comphy_sfi_power_up(u32 lane, void __iomem *hpipe_base,\n \tdata = polling_with_timeout(addr, data, mask, 15000);\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\", sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);\n-\t\terror(\"SD_EXTERNAL_STATUS0_PLL_RX is %d, SD_EXTERNAL_STATUS0_PLL_TX is %d\\n\",\n+\t\tpr_err(\"SD_EXTERNAL_STATUS0_PLL_RX is %d, SD_EXTERNAL_STATUS0_PLL_TX is %d\\n\",\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_RX_MASK),\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_TX_MASK));\n \t\tret = 0;\n@@ -1418,7 +1418,7 @@ static int comphy_sfi_power_up(u32 lane, void __iomem *hpipe_base,\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\",\n \t\t sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);\n-\t\terror(\"SD_EXTERNAL_STATUS0_RX_INIT is 0\\n\");\n+\t\tpr_err(\"SD_EXTERNAL_STATUS0_RX_INIT is 0\\n\");\n \t\tret = 0;\n \t}\n \n@@ -1577,7 +1577,7 @@ static int comphy_rxauii_power_up(u32 lane, void __iomem *hpipe_base,\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\",\n \t\t sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);\n-\t\terror(\"SD_EXTERNAL_STATUS0_PLL_RX is %d, SD_EXTERNAL_STATUS0_PLL_TX is %d\\n\",\n+\t\tpr_err(\"SD_EXTERNAL_STATUS0_PLL_RX is %d, SD_EXTERNAL_STATUS0_PLL_TX is %d\\n\",\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_RX_MASK),\n \t\t (data & SD_EXTERNAL_STATUS0_PLL_TX_MASK));\n \t\tret = 0;\n@@ -1596,7 +1596,7 @@ static int comphy_rxauii_power_up(u32 lane, void __iomem *hpipe_base,\n \tif (data != 0) {\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\",\n \t\t sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);\n-\t\terror(\"SD_EXTERNAL_STATUS0_RX_INIT is 0\\n\");\n+\t\tpr_err(\"SD_EXTERNAL_STATUS0_RX_INIT is 0\\n\");\n \t\tret = 0;\n \t}\n \n@@ -1742,7 +1742,7 @@ static int comphy_utmi_power_up(u32 utmi_index, void __iomem *utmi_base_addr,\n \tmask = data;\n \tdata = polling_with_timeout(addr, data, mask, 100);\n \tif (data != 0) {\n-\t\terror(\"Impedance calibration is not done\\n\");\n+\t\tpr_err(\"Impedance calibration is not done\\n\");\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\", addr, data);\n \t\tret = 0;\n \t}\n@@ -1751,7 +1751,7 @@ static int comphy_utmi_power_up(u32 utmi_index, void __iomem *utmi_base_addr,\n \tmask = data;\n \tdata = polling_with_timeout(addr, data, mask, 100);\n \tif (data != 0) {\n-\t\terror(\"PLL calibration is not done\\n\");\n+\t\tpr_err(\"PLL calibration is not done\\n\");\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\", addr, data);\n \t\tret = 0;\n \t}\n@@ -1761,7 +1761,7 @@ static int comphy_utmi_power_up(u32 utmi_index, void __iomem *utmi_base_addr,\n \tmask = data;\n \tdata = polling_with_timeout(addr, data, mask, 100);\n \tif (data != 0) {\n-\t\terror(\"PLL is not ready\\n\");\n+\t\tpr_err(\"PLL is not ready\\n\");\n \t\tdebug(\"Read from reg = %p - value = 0x%x\\n\", addr, data);\n \t\tret = 0;\n \t}\n@@ -1818,7 +1818,7 @@ static void comphy_utmi_phy_init(u32 utmi_phy_count,\n \t\t\t\t\t cp110_utmi_data[i].usb_cfg_addr,\n \t\t\t\t\t cp110_utmi_data[i].utmi_cfg_addr,\n \t\t\t\t\t cp110_utmi_data[i].utmi_phy_port)) {\n-\t\t\terror(\"Failed to initialize UTMI PHY %d\\n\", i);\n+\t\t\tpr_err(\"Failed to initialize UTMI PHY %d\\n\", i);\n \t\t\tcontinue;\n \t\t}\n \t\tprintf(\"UTMI PHY %d initialized to \", i);\n@@ -1864,7 +1864,7 @@ void comphy_dedicated_phys_init(void)\n \t\t\t(void __iomem *)fdtdec_get_addr_size_auto_noparent(\n \t\t\t\tgd->fdt_blob, node, \"reg\", 0, NULL, true);\n \t\tif (cp110_utmi_data[i].utmi_base_addr == NULL) {\n-\t\t\terror(\"UTMI PHY base address is invalid\\n\");\n+\t\t\tpr_err(\"UTMI PHY base address is invalid\\n\");\n \t\t\ti++;\n \t\t\tcontinue;\n \t\t}\n@@ -1874,7 +1874,7 @@ void comphy_dedicated_phys_init(void)\n \t\t\t(void __iomem *)fdtdec_get_addr_size_auto_noparent(\n \t\t\t\tgd->fdt_blob, node, \"reg\", 1, NULL, true);\n \t\tif (cp110_utmi_data[i].usb_cfg_addr == NULL) {\n-\t\t\terror(\"UTMI PHY base address is invalid\\n\");\n+\t\t\tpr_err(\"UTMI PHY base address is invalid\\n\");\n \t\t\ti++;\n \t\t\tcontinue;\n \t\t}\n@@ -1884,7 +1884,7 @@ void comphy_dedicated_phys_init(void)\n \t\t\t(void __iomem *)fdtdec_get_addr_size_auto_noparent(\n \t\t\t\tgd->fdt_blob, node, \"reg\", 2, NULL, true);\n \t\tif (cp110_utmi_data[i].utmi_cfg_addr == NULL) {\n-\t\t\terror(\"UTMI PHY base address is invalid\\n\");\n+\t\t\tpr_err(\"UTMI PHY base address is invalid\\n\");\n \t\t\ti++;\n \t\t\tcontinue;\n \t\t}\n@@ -1896,7 +1896,7 @@ void comphy_dedicated_phys_init(void)\n \t\tcp110_utmi_data[i].utmi_phy_port = fdtdec_get_int(\n \t\t\tgd->fdt_blob, node, \"utmi-port\", UTMI_PHY_INVALID);\n \t\tif (cp110_utmi_data[i].utmi_phy_port == UTMI_PHY_INVALID) {\n-\t\t\terror(\"UTMI PHY port type is invalid\\n\");\n+\t\t\tpr_err(\"UTMI PHY port type is invalid\\n\");\n \t\t\ti++;\n \t\t\tcontinue;\n \t\t}\n@@ -2049,7 +2049,7 @@ int comphy_cp110_init(struct chip_serdes_phy_config *ptr_chip_cfg,\n \t\t\t * PHY_TYPE_UNCONNECTED state.\n \t\t\t */\n \t\t\tptr_comphy_map->type = PHY_TYPE_UNCONNECTED;\n-\t\t\terror(\"PLL is not locked - Failed to initialize lane %d\\n\",\n+\t\t\tpr_err(\"PLL is not locked - Failed to initialize lane %d\\n\",\n \t\t\t lane);\n \t\t}\n \t}\ndiff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c\nindex 680e32f3ea6f..babf2ffe393e 100644\n--- a/drivers/phy/ti-pipe3-phy.c\n+++ b/drivers/phy/ti-pipe3-phy.c\n@@ -261,7 +261,7 @@ static int pipe3_exit(struct phy *phy)\n \t} while (--timeout);\n \n \tif (!(val & PLL_TICOPWDN) || !(val & PLL_LDOPWDN)) {\n-\t\terror(\"%s: Failed to power down DPLL: PLL_STATUS 0x%x\\n\",\n+\t\tpr_err(\"%s: Failed to power down DPLL: PLL_STATUS 0x%x\\n\",\n \t\t __func__, val);\n \t\treturn -EBUSY;\n \t}\n@@ -284,14 +284,14 @@ static void *get_reg(struct udevice *dev, const char *name)\n \terr = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,\n \t\t\t\t\t name, &syscon);\n \tif (err) {\n-\t\terror(\"unable to find syscon device for %s (%d)\\n\",\n+\t\tpr_err(\"unable to find syscon device for %s (%d)\\n\",\n \t\t name, err);\n \t\treturn NULL;\n \t}\n \n \tregmap = syscon_get_regmap(syscon);\n \tif (IS_ERR(regmap)) {\n-\t\terror(\"unable to find regmap for %s (%ld)\\n\",\n+\t\tpr_err(\"unable to find regmap for %s (%ld)\\n\",\n \t\t name, PTR_ERR(regmap));\n \t\treturn NULL;\n \t}\n@@ -299,7 +299,7 @@ static void *get_reg(struct udevice *dev, const char *name)\n \tcell = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), name,\n \t\t\t &len);\n \tif (len < 2*sizeof(fdt32_t)) {\n-\t\terror(\"offset not available for %s\\n\", name);\n+\t\tpr_err(\"offset not available for %s\\n\", name);\n \t\treturn NULL;\n \t}\n \n@@ -318,13 +318,13 @@ static int pipe3_phy_probe(struct udevice *dev)\n \n \taddr = devfdt_get_addr_size_index(dev, 2, &sz);\n \tif (addr == FDT_ADDR_T_NONE) {\n-\t\terror(\"missing pll ctrl address\\n\");\n+\t\tpr_err(\"missing pll ctrl address\\n\");\n \t\treturn -EINVAL;\n \t}\n \n \tpipe3->pll_ctrl_base = map_physmem(addr, sz, MAP_NOCACHE);\n \tif (!pipe3->pll_ctrl_base) {\n-\t\terror(\"unable to remap pll ctrl\\n\");\n+\t\tpr_err(\"unable to remap pll ctrl\\n\");\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c\nindex 27165b000773..2bf853eba13d 100644\n--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c\n+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c\n@@ -578,7 +578,7 @@ int armada_37xx_pinctrl_probe(struct udevice *dev)\n \n \tinfo->base = (void __iomem *)devfdt_get_addr(dev);\n \tif (!info->base) {\n-\t\terror(\"unable to find regmap\\n\");\n+\t\tpr_err(\"unable to find regmap\\n\");\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c\nindex 40341b4eeb75..735e412f608e 100644\n--- a/drivers/pinctrl/pinctrl-sti.c\n+++ b/drivers/pinctrl/pinctrl-sti.c\n@@ -142,7 +142,7 @@ void sti_pin_configure(struct udevice *dev, struct sti_pin_desc *pin_desc)\n \t\tbreak;\n \n \tdefault:\n-\t\terror(\"%s invalid direction value: 0x%x\\n\",\n+\t\tpr_err(\"%s invalid direction value: 0x%x\\n\",\n \t\t __func__, pin_desc->dir);\n \t\tBUG();\n \t\tbreak;\n@@ -237,14 +237,14 @@ static int sti_pinctrl_set_state(struct udevice *dev, struct udevice *config)\n \t\t\t\t\t\t prop_name, \"#gpio-cells\",\n \t\t\t\t\t\t 0, 0, &args);\n \t\tif (ret < 0) {\n-\t\t\terror(\"Can't get the gpio bank phandle: %d\\n\", ret);\n+\t\t\tpr_err(\"Can't get the gpio bank phandle: %d\\n\", ret);\n \t\t\treturn ret;\n \t\t}\n \n \t\tbank_name = fdt_getprop(blob, args.node, \"st,bank-name\",\n \t\t\t\t\t&count);\n \t\tif (count < 0) {\n-\t\t\terror(\"Can't find bank-name property %d\\n\", count);\n+\t\t\tpr_err(\"Can't find bank-name property %d\\n\", count);\n \t\t\treturn -EINVAL;\n \t\t}\n \n@@ -254,12 +254,12 @@ static int sti_pinctrl_set_state(struct udevice *dev, struct udevice *config)\n \t\t\t\t\t\t prop_name, cells,\n \t\t\t\t\t\t ARRAY_SIZE(cells));\n \t\tif (count < 0) {\n-\t\t\terror(\"Bad pin configuration array %d\\n\", count);\n+\t\t\tpr_err(\"Bad pin configuration array %d\\n\", count);\n \t\t\treturn -EINVAL;\n \t\t}\n \n \t\tif (count > MAX_STI_PINCONF_ENTRIES) {\n-\t\t\terror(\"Unsupported pinconf array count %d\\n\", count);\n+\t\t\tpr_err(\"Unsupported pinconf array count %d\\n\", count);\n \t\t\treturn -EINVAL;\n \t\t}\n \n@@ -284,13 +284,13 @@ static int sti_pinctrl_probe(struct udevice *dev)\n \terr = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,\n \t\t\t\t\t \"st,syscfg\", &syscon);\n \tif (err) {\n-\t\terror(\"unable to find syscon device\\n\");\n+\t\tpr_err(\"unable to find syscon device\\n\");\n \t\treturn err;\n \t}\n \n \tplat->regmap = syscon_get_regmap(syscon);\n \tif (!plat->regmap) {\n-\t\terror(\"unable to find regmap\\n\");\n+\t\tpr_err(\"unable to find regmap\\n\");\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c\nindex fb2593c69044..62ba0890837c 100644\n--- a/drivers/pinctrl/pinctrl_stm32.c\n+++ b/drivers/pinctrl/pinctrl_stm32.c\n@@ -160,7 +160,7 @@ static int stm32_pinctrl_set_state_simple(struct udevice *dev,\n \n \t\tconfig_node = fdt_node_offset_by_phandle(fdt, phandle);\n \t\tif (config_node < 0) {\n-\t\t\terror(\"prop pinctrl-0 index %d invalid phandle\\n\", i);\n+\t\t\tpr_err(\"prop pinctrl-0 index %d invalid phandle\\n\", i);\n \t\t\treturn -EINVAL;\n \t\t}\n \ndiff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c\nindex 4efe8ee183d5..3b0427e0b918 100644\n--- a/drivers/power/pmic/as3722.c\n+++ b/drivers/power/pmic/as3722.c\n@@ -46,14 +46,14 @@ static int as3722_read_id(struct udevice *dev, uint *idp, uint *revisionp)\n \n \tret = pmic_reg_read(dev, AS3722_ASIC_ID1);\n \tif (ret < 0) {\n-\t\terror(\"failed to read ID1 register: %d\", ret);\n+\t\tpr_err(\"failed to read ID1 register: %d\", ret);\n \t\treturn ret;\n \t}\n \t*idp = ret;\n \n \tret = pmic_reg_read(dev, AS3722_ASIC_ID2);\n \tif (ret < 0) {\n-\t\terror(\"failed to read ID2 register: %d\", ret);\n+\t\tpr_err(\"failed to read ID2 register: %d\", ret);\n \t\treturn ret;\n \t}\n \t*revisionp = ret;\n@@ -71,7 +71,7 @@ int as3722_sd_set_voltage(struct udevice *dev, unsigned int sd, u8 value)\n \n \tret = pmic_reg_write(dev, AS3722_SD_VOLTAGE(sd), value);\n \tif (ret < 0) {\n-\t\terror(\"failed to write SD%u voltage register: %d\", sd, ret);\n+\t\tpr_err(\"failed to write SD%u voltage register: %d\", sd, ret);\n \t\treturn ret;\n \t}\n \n@@ -87,7 +87,7 @@ int as3722_ldo_set_voltage(struct udevice *dev, unsigned int ldo, u8 value)\n \n \tret = pmic_reg_write(dev, AS3722_LDO_VOLTAGE(ldo), value);\n \tif (ret < 0) {\n-\t\terror(\"failed to write LDO%u voltage register: %d\", ldo,\n+\t\tpr_err(\"failed to write LDO%u voltage register: %d\", ldo,\n \t\t ret);\n \t\treturn ret;\n \t}\n@@ -102,12 +102,12 @@ static int as3722_probe(struct udevice *dev)\n \n \tret = as3722_read_id(dev, &id, &revision);\n \tif (ret < 0) {\n-\t\terror(\"failed to read ID: %d\", ret);\n+\t\tpr_err(\"failed to read ID: %d\", ret);\n \t\treturn ret;\n \t}\n \n \tif (id != AS3722_DEVICE_ID) {\n-\t\terror(\"unknown device\");\n+\t\tpr_err(\"unknown device\");\n \t\treturn -ENOENT;\n \t}\n \ndiff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c\nindex d0b681ca4ab9..5cf4cb6b518e 100644\n--- a/drivers/power/pmic/as3722_gpio.c\n+++ b/drivers/power/pmic/as3722_gpio.c\n@@ -26,7 +26,7 @@ int as3722_gpio_configure(struct udevice *pmic, unsigned int gpio,\n \n \terr = pmic_reg_write(pmic, AS3722_GPIO_CONTROL(gpio), value);\n \tif (err) {\n-\t\terror(\"failed to configure GPIO#%u: %d\", gpio, err);\n+\t\tpr_err(\"failed to configure GPIO#%u: %d\", gpio, err);\n \t\treturn err;\n \t}\n \n@@ -46,7 +46,7 @@ static int as3722_gpio_set_value(struct udevice *dev, unsigned int gpio,\n \n \terr = pmic_reg_read(pmic, AS3722_GPIO_SIGNAL_OUT);\n \tif (err < 0) {\n-\t\terror(\"failed to read GPIO signal out register: %d\", err);\n+\t\tpr_err(\"failed to read GPIO signal out register: %d\", err);\n \t\treturn err;\n \t}\n \tvalue = err;\n@@ -61,7 +61,7 @@ static int as3722_gpio_set_value(struct udevice *dev, unsigned int gpio,\n \n \terr = pmic_reg_write(pmic, AS3722_GPIO_SIGNAL_OUT, value);\n \tif (err) {\n-\t\terror(\"failed to set GPIO#%u %s: %d\", gpio, l, err);\n+\t\tpr_err(\"failed to set GPIO#%u %s: %d\", gpio, l, err);\n \t\treturn err;\n \t}\n \n@@ -84,13 +84,13 @@ int as3722_gpio_direction_output(struct udevice *dev, unsigned int gpio,\n \n \terr = pmic_reg_write(pmic, AS3722_GPIO_CONTROL(gpio), value);\n \tif (err) {\n-\t\terror(\"failed to configure GPIO#%u as output: %d\", gpio, err);\n+\t\tpr_err(\"failed to configure GPIO#%u as output: %d\", gpio, err);\n \t\treturn err;\n \t}\n \n \terr = as3722_gpio_set_value(pmic, gpio, value);\n \tif (err < 0) {\n-\t\terror(\"failed to set GPIO#%u high: %d\", gpio, err);\n+\t\tpr_err(\"failed to set GPIO#%u high: %d\", gpio, err);\n \t\treturn err;\n \t}\n \ndiff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c\nindex 2d35d09d454c..38a2a04f1776 100644\n--- a/drivers/power/pmic/i2c_pmic_emul.c\n+++ b/drivers/power/pmic/i2c_pmic_emul.c\n@@ -31,7 +31,7 @@ static int sandbox_i2c_pmic_read_data(struct udevice *emul, uchar chip,\n \tstruct sandbox_i2c_pmic_plat_data *plat = dev_get_platdata(emul);\n \n \tif (plat->rw_reg + len > SANDBOX_PMIC_REG_COUNT) {\n-\t\terror(\"Request exceeds PMIC register range! Max register: %#x\",\n+\t\tpr_err(\"Request exceeds PMIC register range! Max register: %#x\",\n \t\t SANDBOX_PMIC_REG_COUNT);\n \t\treturn -EFAULT;\n \t}\n@@ -68,7 +68,7 @@ static int sandbox_i2c_pmic_write_data(struct udevice *emul, uchar chip,\n \tlen--;\n \n \tif (plat->rw_reg + len > SANDBOX_PMIC_REG_COUNT) {\n-\t\terror(\"Request exceeds PMIC register range! Max register: %#x\",\n+\t\tpr_err(\"Request exceeds PMIC register range! Max register: %#x\",\n \t\t SANDBOX_PMIC_REG_COUNT);\n \t}\n \n@@ -111,7 +111,7 @@ static int sandbox_i2c_pmic_ofdata_to_platdata(struct udevice *emul)\n \t\t\t\t\t SANDBOX_PMIC_REG_COUNT);\n \n \tif (!reg_defaults) {\n-\t\terror(\"Property \\\"reg-defaults\\\" not found for device: %s!\",\n+\t\tpr_err(\"Property \\\"reg-defaults\\\" not found for device: %s!\",\n \t\t emul->name);\n \t\treturn -EINVAL;\n \t}\ndiff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c\nindex f5054683139a..95c2b7e8c74c 100644\n--- a/drivers/power/pmic/lp873x.c\n+++ b/drivers/power/pmic/lp873x.c\n@@ -27,7 +27,7 @@ static int lp873x_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \t\t\t int len)\n {\n \tif (dm_i2c_write(dev, reg, buff, len)) {\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -37,7 +37,7 @@ static int lp873x_write(struct udevice *dev, uint reg, const uint8_t *buff,\n static int lp873x_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n {\n \tif (dm_i2c_read(dev, reg, buff, len)) {\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c\nindex 782a46c4cc31..506769e36267 100644\n--- a/drivers/power/pmic/lp87565.c\n+++ b/drivers/power/pmic/lp87565.c\n@@ -29,7 +29,7 @@ static int lp87565_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \n \tret = dm_i2c_write(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\n@@ -40,7 +40,7 @@ static int lp87565_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n \n \tret = dm_i2c_read(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\ndiff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c\nindex ceca9f96a7f3..b3ed84992ff8 100644\n--- a/drivers/power/pmic/max77686.c\n+++ b/drivers/power/pmic/max77686.c\n@@ -31,7 +31,7 @@ static int max77686_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \t\t\t int len)\n {\n \tif (dm_i2c_write(dev, reg, buff, len)) {\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -41,7 +41,7 @@ static int max77686_write(struct udevice *dev, uint reg, const uint8_t *buff,\n static int max77686_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n {\n \tif (dm_i2c_read(dev, reg, buff, len)) {\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/power/pmic/max8997.c b/drivers/power/pmic/max8997.c\nindex f749d7debfc3..5ebeb8a316be 100644\n--- a/drivers/power/pmic/max8997.c\n+++ b/drivers/power/pmic/max8997.c\n@@ -26,7 +26,7 @@ static int max8997_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \n \tret = dm_i2c_write(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\n@@ -37,7 +37,7 @@ static int max8997_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n \n \tret = dm_i2c_read(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\ndiff --git a/drivers/power/pmic/max8998.c b/drivers/power/pmic/max8998.c\nindex 7c4773c7b3aa..a7e04699e8ba 100644\n--- a/drivers/power/pmic/max8998.c\n+++ b/drivers/power/pmic/max8998.c\n@@ -26,7 +26,7 @@ static int max8998_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \n \tret = dm_i2c_write(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\n@@ -37,7 +37,7 @@ static int max8998_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n \n \tret = dm_i2c_read(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\ndiff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c\nindex 804c0d13a0c9..1e1ecb382e3a 100644\n--- a/drivers/power/pmic/palmas.c\n+++ b/drivers/power/pmic/palmas.c\n@@ -27,7 +27,7 @@ static int palmas_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \t\t\t int len)\n {\n \tif (dm_i2c_write(dev, reg, buff, len)) {\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -37,7 +37,7 @@ static int palmas_write(struct udevice *dev, uint reg, const uint8_t *buff,\n static int palmas_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n {\n \tif (dm_i2c_read(dev, reg, buff, len)) {\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c\nindex 5f361c7696f4..a06cbc07d491 100644\n--- a/drivers/power/pmic/pfuze100.c\n+++ b/drivers/power/pmic/pfuze100.c\n@@ -33,7 +33,7 @@ static int pfuze100_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \t\t\t int len)\n {\n \tif (dm_i2c_write(dev, reg, buff, len)) {\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -43,7 +43,7 @@ static int pfuze100_write(struct udevice *dev, uint reg, const uint8_t *buff,\n static int pfuze100_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n {\n \tif (dm_i2c_read(dev, reg, buff, len)) {\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c\nindex 9d83059c403a..522105e5ff05 100644\n--- a/drivers/power/pmic/s2mps11.c\n+++ b/drivers/power/pmic/s2mps11.c\n@@ -27,7 +27,7 @@ static int s2mps11_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \n \tret = dm_i2c_write(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\n@@ -38,7 +38,7 @@ static int s2mps11_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n \n \tret = dm_i2c_read(dev, reg, buff, len);\n \tif (ret)\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \n \treturn ret;\n }\ndiff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c\nindex f8ae5ea2dba4..3812e240ab08 100644\n--- a/drivers/power/pmic/s5m8767.c\n+++ b/drivers/power/pmic/s5m8767.c\n@@ -30,7 +30,7 @@ static int s5m8767_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \t\t\t int len)\n {\n \tif (dm_i2c_write(dev, reg, buff, len)) {\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -40,7 +40,7 @@ static int s5m8767_write(struct udevice *dev, uint reg, const uint8_t *buff,\n static int s5m8767_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n {\n \tif (dm_i2c_read(dev, reg, buff, len)) {\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c\nindex 6763303c6671..e8d6faca160c 100644\n--- a/drivers/power/pmic/sandbox.c\n+++ b/drivers/power/pmic/sandbox.c\n@@ -31,7 +31,7 @@ static int sandbox_pmic_write(struct udevice *dev, uint reg,\n \t\t\t const uint8_t *buff, int len)\n {\n \tif (dm_i2c_write(dev, reg, buff, len)) {\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -42,7 +42,7 @@ static int sandbox_pmic_read(struct udevice *dev, uint reg,\n \t\t\t uint8_t *buff, int len)\n {\n \tif (dm_i2c_read(dev, reg, buff, len)) {\n-\t\terror(\"read error from device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"read error from device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -52,7 +52,7 @@ static int sandbox_pmic_read(struct udevice *dev, uint reg,\n static int sandbox_pmic_bind(struct udevice *dev)\n {\n \tif (!pmic_bind_children(dev, dev_ofnode(dev), pmic_children_info))\n-\t\terror(\"%s:%d PMIC: %s - no child found!\", __func__, __LINE__,\n+\t\tpr_err(\"%s:%d PMIC: %s - no child found!\", __func__, __LINE__,\n \t\t\t\t\t\t\t dev->name);\n \n \t/* Always return success for this device - allows for PMIC I/O */\ndiff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c\nindex 4565e3b54c1b..ee5358bcedc8 100644\n--- a/drivers/power/pmic/tps65090.c\n+++ b/drivers/power/pmic/tps65090.c\n@@ -29,7 +29,7 @@ static int tps65090_write(struct udevice *dev, uint reg, const uint8_t *buff,\n \t\t\t int len)\n {\n \tif (dm_i2c_write(dev, reg, buff, len)) {\n-\t\terror(\"write error to device: %p register: %#x!\", dev, reg);\n+\t\tpr_err(\"write error to device: %p register: %#x!\", dev, reg);\n \t\treturn -EIO;\n \t}\n \n@@ -42,7 +42,7 @@ static int tps65090_read(struct udevice *dev, uint reg, uint8_t *buff, int len)\n \n \tret = dm_i2c_read(dev, reg, buff, len);\n \tif (ret) {\n-\t\terror(\"read error %d from device: %p register: %#x!\", ret, dev,\n+\t\tpr_err(\"read error %d from device: %p register: %#x!\", ret, dev,\n \t\t reg);\n \t\treturn -EIO;\n \t}\ndiff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c\nindex 35c292222b97..97b4a98bf0b6 100644\n--- a/drivers/power/regulator/fixed.c\n+++ b/drivers/power/regulator/fixed.c\n@@ -117,7 +117,7 @@ static int fixed_regulator_set_enable(struct udevice *dev, bool enable)\n \n \tret = dm_gpio_set_value(&dev_pdata->gpio, enable);\n \tif (ret) {\n-\t\terror(\"Can't set regulator : %s gpio to: %d\\n\", dev->name,\n+\t\tpr_err(\"Can't set regulator : %s gpio to: %d\\n\", dev->name,\n \t\t enable);\n \t\treturn ret;\n \t}\ndiff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c\nindex 42391c69b430..1031a0362b67 100644\n--- a/drivers/power/regulator/gpio-regulator.c\n+++ b/drivers/power/regulator/gpio-regulator.c\n@@ -109,7 +109,7 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV)\n \n \tret = dm_gpio_set_value(&dev_pdata->gpio, enable);\n \tif (ret) {\n-\t\terror(\"Can't set regulator : %s gpio to: %d\\n\", dev->name,\n+\t\tpr_err(\"Can't set regulator : %s gpio to: %d\\n\", dev->name,\n \t\t enable);\n \t\treturn ret;\n \t}\ndiff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c\nindex 8780806cff04..2212d36ed6a9 100644\n--- a/drivers/power/regulator/max77686.c\n+++ b/drivers/power/regulator/max77686.c\n@@ -98,7 +98,7 @@ static int max77686_buck_volt2hex(int buck, int uV)\n \tif (hex >= 0 && hex <= hex_max)\n \t\treturn hex;\n \n-\terror(\"Value: %d uV is wrong for BUCK%d\", uV, buck);\n+\tpr_err(\"Value: %d uV is wrong for BUCK%d\", uV, buck);\n \treturn -EINVAL;\n }\n \n@@ -134,7 +134,7 @@ static int max77686_buck_hex2volt(int buck, int hex)\n \treturn uV;\n \n bad_hex:\n-\terror(\"Value: %#x is wrong for BUCK%d\", hex, buck);\n+\tpr_err(\"Value: %#x is wrong for BUCK%d\", hex, buck);\n \treturn -EINVAL;\n }\n \n@@ -160,7 +160,7 @@ static int max77686_ldo_volt2hex(int ldo, int uV)\n \tif (hex >= 0 && hex <= MAX77686_LDO_VOLT_MAX_HEX)\n \t\treturn hex;\n \n-\terror(\"Value: %d uV is wrong for LDO%d\", uV, ldo);\n+\tpr_err(\"Value: %d uV is wrong for LDO%d\", uV, ldo);\n \treturn -EINVAL;\n }\n \n@@ -189,7 +189,7 @@ static int max77686_ldo_hex2volt(int ldo, int hex)\n \treturn uV;\n \n bad_hex:\n-\terror(\"Value: %#x is wrong for ldo%d\", hex, ldo);\n+\tpr_err(\"Value: %#x is wrong for ldo%d\", hex, ldo);\n \treturn -EINVAL;\n }\n \n@@ -328,7 +328,7 @@ static int max77686_ldo_val(struct udevice *dev, int op, int *uV)\n \n \tldo = dev->driver_data;\n \tif (ldo < 1 || ldo > MAX77686_LDO_NUM) {\n-\t\terror(\"Wrong ldo number: %d\", ldo);\n+\t\tpr_err(\"Wrong ldo number: %d\", ldo);\n \t\treturn -EINVAL;\n \t}\n \n@@ -366,7 +366,7 @@ static int max77686_buck_val(struct udevice *dev, int op, int *uV)\n \n \tbuck = dev->driver_data;\n \tif (buck < 1 || buck > MAX77686_BUCK_NUM) {\n-\t\terror(\"Wrong buck number: %d\", buck);\n+\t\tpr_err(\"Wrong buck number: %d\", buck);\n \t\treturn -EINVAL;\n \t}\n \n@@ -423,7 +423,7 @@ static int max77686_ldo_mode(struct udevice *dev, int op, int *opmode)\n \n \tldo = dev->driver_data;\n \tif (ldo < 1 || ldo > MAX77686_LDO_NUM) {\n-\t\terror(\"Wrong ldo number: %d\", ldo);\n+\t\tpr_err(\"Wrong ldo number: %d\", ldo);\n \t\treturn -EINVAL;\n \t}\n \n@@ -493,7 +493,7 @@ static int max77686_ldo_mode(struct udevice *dev, int op, int *opmode)\n \t}\n \n \tif (mode == 0xff) {\n-\t\terror(\"Wrong mode: %d for ldo%d\", *opmode, ldo);\n+\t\tpr_err(\"Wrong mode: %d for ldo%d\", *opmode, ldo);\n \t\treturn -EINVAL;\n \t}\n \n@@ -545,7 +545,7 @@ static int max77686_buck_mode(struct udevice *dev, int op, int *opmode)\n \n \tbuck = dev->driver_data;\n \tif (buck < 1 || buck > MAX77686_BUCK_NUM) {\n-\t\terror(\"Wrong buck number: %d\", buck);\n+\t\tpr_err(\"Wrong buck number: %d\", buck);\n \t\treturn -EINVAL;\n \t}\n \n@@ -614,7 +614,7 @@ static int max77686_buck_mode(struct udevice *dev, int op, int *opmode)\n \t}\n \n \tif (mode == 0xff) {\n-\t\terror(\"Wrong mode: %d for buck: %d\\n\", *opmode, buck);\n+\t\tpr_err(\"Wrong mode: %d for buck: %d\\n\", *opmode, buck);\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c\nindex 06c09fd05151..f980a17389eb 100644\n--- a/drivers/power/regulator/sandbox.c\n+++ b/drivers/power/regulator/sandbox.c\n@@ -87,7 +87,7 @@ int out_get_value(struct udevice *dev, int output_count, int reg_type,\n \tint ret;\n \n \tif (dev->driver_data > output_count) {\n-\t\terror(\"Unknown regulator number: %lu for PMIC %s!\",\n+\t\tpr_err(\"Unknown regulator number: %lu for PMIC %s!\",\n \t\t dev->driver_data, dev->name);\n \t\treturn -EINVAL;\n \t}\n@@ -95,7 +95,7 @@ int out_get_value(struct udevice *dev, int output_count, int reg_type,\n \treg = (dev->driver_data - 1) * OUT_REG_COUNT + reg_type;\n \tret = pmic_read(dev->parent, reg, ®_val, 1);\n \tif (ret) {\n-\t\terror(\"PMIC read failed: %d\\n\", ret);\n+\t\tpr_err(\"PMIC read failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -115,14 +115,14 @@ static int out_set_value(struct udevice *dev, int output_count, int reg_type,\n \tint max_value;\n \n \tif (dev->driver_data > output_count) {\n-\t\terror(\"Unknown regulator number: %lu for PMIC %s!\",\n+\t\tpr_err(\"Unknown regulator number: %lu for PMIC %s!\",\n \t\t dev->driver_data, dev->name);\n \t\treturn -EINVAL;\n \t}\n \n \tmax_value = range[dev->driver_data - 1].max;\n \tif (value > max_value) {\n-\t\terror(\"Wrong value for %s: %lu. Max is: %d.\",\n+\t\tpr_err(\"Wrong value for %s: %lu. Max is: %d.\",\n \t\t dev->name, dev->driver_data, max_value);\n \t\treturn -EINVAL;\n \t}\n@@ -134,7 +134,7 @@ static int out_set_value(struct udevice *dev, int output_count, int reg_type,\n \treg = (dev->driver_data - 1) * OUT_REG_COUNT + reg_type;\n \tret = pmic_write(dev->parent, reg, ®_val, 1);\n \tif (ret) {\n-\t\terror(\"PMIC write failed: %d\\n\", ret);\n+\t\tpr_err(\"PMIC write failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -154,7 +154,7 @@ static int out_get_mode(struct udevice *dev)\n \treg = (dev->driver_data - 1) * OUT_REG_COUNT + OUT_REG_OM;\n \tret = pmic_read(dev->parent, reg, ®_val, 1);\n \tif (ret) {\n-\t\terror(\"PMIC read failed: %d\\n\", ret);\n+\t\tpr_err(\"PMIC read failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -163,7 +163,7 @@ static int out_get_mode(struct udevice *dev)\n \t\t\treturn uc_pdata->mode[i].id;\n \t}\n \n-\terror(\"Unknown operation mode for %s!\", dev->name);\n+\tpr_err(\"Unknown operation mode for %s!\", dev->name);\n \treturn -EINVAL;\n }\n \n@@ -188,14 +188,14 @@ static int out_set_mode(struct udevice *dev, int mode)\n \t}\n \n \tif (reg_val == -1) {\n-\t\terror(\"Unknown operation mode for %s!\", dev->name);\n+\t\tpr_err(\"Unknown operation mode for %s!\", dev->name);\n \t\treturn -EINVAL;\n \t}\n \n \treg = (dev->driver_data - 1) * OUT_REG_COUNT + OUT_REG_OM;\n \tret = pmic_write(dev->parent, reg, (uint8_t *)®_val, 1);\n \tif (ret) {\n-\t\terror(\"PMIC write failed: %d\\n\", ret);\n+\t\tpr_err(\"PMIC write failed: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c\nindex ca7b1ff0c841..975c81201ca1 100644\n--- a/drivers/ram/rockchip/dmc-rk3368.c\n+++ b/drivers/ram/rockchip/dmc-rk3368.c\n@@ -230,7 +230,7 @@ static int memory_init(struct rk3368_ddr_pctl *pctl,\n \ttmp = get_timer(0);\n \tdo {\n \t\tif (get_timer(tmp) > timeout_ms) {\n-\t\t\terror(\"%s: POWER_UP_START did not complete in %ld ms\\n\",\n+\t\t\tpr_err(\"%s: POWER_UP_START did not complete in %ld ms\\n\",\n \t\t\t __func__, timeout_ms);\n \t\t\treturn -ETIME;\n \t\t}\n@@ -422,7 +422,7 @@ static int dfi_cfg(struct rk3368_ddr_pctl *pctl)\n \ttmp = get_timer(0);\n \tdo {\n \t\tif (get_timer(tmp) > timeout_ms) {\n-\t\t\terror(\"%s: DFI init did not complete within %ld ms\\n\",\n+\t\t\tpr_err(\"%s: DFI init did not complete within %ld ms\\n\",\n \t\t\t __func__, timeout_ms);\n \t\t\treturn -ETIME;\n \t\t}\n@@ -457,7 +457,7 @@ static int pctl_calc_timings(struct rk3368_sdram_params *params,\n \tu32 tfaw_as_ps;\n \n \tif (params->ddr_speed_bin != DDR3_1600K) {\n-\t\terror(\"%s: unimplemented DDR3 speed bin %d\\n\",\n+\t\tpr_err(\"%s: unimplemented DDR3 speed bin %d\\n\",\n \t\t __func__, params->ddr_speed_bin);\n \t\treturn -1;\n \t}\n@@ -585,7 +585,7 @@ static int ddrphy_data_training(struct rk3368_ddr_pctl *pctl,\n \ttmp = get_timer(0);\n \tdo {\n \t\tif (get_timer(tmp) > timeout_ms) {\n-\t\t\terror(\"%s: did not complete within %ld ms\\n\",\n+\t\t\tpr_err(\"%s: did not complete within %ld ms\\n\",\n \t\t\t __func__, timeout_ms);\n \t\t\treturn -ETIME;\n \t\t}\n@@ -625,7 +625,7 @@ static int sdram_col_row_detect(struct udevice *dev)\n \t}\n \n \tif (col == 8) {\n-\t\terror(\"%s: col detect error\\n\", __func__);\n+\t\tpr_err(\"%s: col detect error\\n\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -644,7 +644,7 @@ static int sdram_col_row_detect(struct udevice *dev)\n \t}\n \n \tif (row == 11) {\n-\t\terror(\"%s: row detect error\\n\", __func__);\n+\t\tpr_err(\"%s: row detect error\\n\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -764,7 +764,7 @@ static int msch_niu_config(struct rk3368_msch *msch,\n \t\t}\n \t}\n \n-\terror(\"%s: ddrconf (NIU config) not found\\n\", __func__);\n+\tpr_err(\"%s: ddrconf (NIU config) not found\\n\", __func__);\n \treturn -EINVAL;\n }\n \ndiff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c\nindex b1b0289a1b05..fdf088e78336 100644\n--- a/drivers/ram/stm32_sdram.c\n+++ b/drivers/ram/stm32_sdram.c\n@@ -262,7 +262,7 @@ static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)\n \t\tbank_name = (char *)ofnode_get_name(bank_node);\n \t\tstrsep(&bank_name, \"@\");\n \t\tif (!bank_name) {\n-\t\t\terror(\"missing sdram bank index\");\n+\t\t\tpr_err(\"missing sdram bank index\");\n \t\t\treturn -EINVAL;\n \t\t}\n \n@@ -271,7 +271,7 @@ static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)\n \t\t\t (long unsigned int *)&bank_params->target_bank);\n \n \t\tif (bank_params->target_bank >= MAX_SDRAM_BANK) {\n-\t\t\terror(\"Found bank %d , but only bank 0 and 1 are supported\",\n+\t\t\tpr_err(\"Found bank %d , but only bank 0 and 1 are supported\",\n \t\t\t bank_params->target_bank);\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -285,7 +285,7 @@ static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)\n \t\t\t\t\t\t sizeof(struct stm32_sdram_control));\n \n \t\tif (!params->bank_params[bank].sdram_control) {\n-\t\t\terror(\"st,sdram-control not found for %s\",\n+\t\t\tpr_err(\"st,sdram-control not found for %s\",\n \t\t\t ofnode_get_name(bank_node));\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -298,7 +298,7 @@ static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)\n \t\t\t\t\t\t sizeof(struct stm32_sdram_timing));\n \n \t\tif (!params->bank_params[bank].sdram_timing) {\n-\t\t\terror(\"st,sdram-timing not found for %s\",\n+\t\t\tpr_err(\"st,sdram-timing not found for %s\",\n \t\t\t ofnode_get_name(bank_node));\n \t\t\treturn -EINVAL;\n \t\t}\ndiff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c\nindex a79708cde280..024b996f0c16 100644\n--- a/drivers/reset/sti-reset.c\n+++ b/drivers/reset/sti-reset.c\n@@ -201,20 +201,20 @@ phys_addr_t sti_reset_get_regmap(const char *compatible)\n \tnode = fdt_node_offset_by_compatible(gd->fdt_blob, -1,\n \t\t\t\t\t compatible);\n \tif (node < 0) {\n-\t\terror(\"unable to find %s node\\n\", compatible);\n+\t\tpr_err(\"unable to find %s node\\n\", compatible);\n \t\treturn node;\n \t}\n \n \tret = uclass_get_device_by_of_offset(UCLASS_SYSCON, node, &syscon);\n \tif (ret) {\n-\t\terror(\"%s: uclass_get_device_by_of_offset failed: %d\\n\",\n+\t\tpr_err(\"%s: uclass_get_device_by_of_offset failed: %d\\n\",\n \t\t __func__, ret);\n \t\treturn ret;\n \t}\n \n \tregmap = syscon_get_regmap(syscon);\n \tif (!regmap) {\n-\t\terror(\"unable to get regmap for %s\\n\", syscon->name);\n+\t\tpr_err(\"unable to get regmap for %s\\n\", syscon->name);\n \t\treturn -ENODEV;\n \t}\n \n@@ -251,7 +251,7 @@ static int sti_reset_program_hw(struct reset_ctl *reset_ctl, int assert)\n \t\t\tif (ch->deassert_cnt > 0)\n \t\t\t\treturn 0;\n \t\t} else\n-\t\t\terror(\"Reset balancing error: reset_ctl=%p dev=%p id=%lu\\n\",\n+\t\t\tpr_err(\"Reset balancing error: reset_ctl=%p dev=%p id=%lu\\n\",\n \t\t\t reset_ctl, reset_ctl->dev, reset_ctl->id);\n \t}\n \n@@ -268,7 +268,7 @@ static int sti_reset_program_hw(struct reset_ctl *reset_ctl, int assert)\n \treg = (void __iomem *)base + ch->ack_offset;\n \tif (wait_for_bit(__func__, reg, BIT(ch->ack_bit), ctrl_val,\n \t\t\t 1000, false)) {\n-\t\terror(\"Stuck on waiting ack reset_ctl=%p dev=%p id=%lu\\n\",\n+\t\tpr_err(\"Stuck on waiting ack reset_ctl=%p dev=%p id=%lu\\n\",\n \t\t reset_ctl, reset_ctl->dev, reset_ctl->id);\n \n \t\treturn -ETIMEDOUT;\ndiff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c\nindex e2f8342e887f..228e714e0933 100644\n--- a/drivers/spi/atmel_spi.c\n+++ b/drivers/spi/atmel_spi.c\n@@ -474,7 +474,7 @@ static int atmel_spi_probe(struct udevice *bus)\n \tret = gpio_request_list_by_name(bus, \"cs-gpios\", priv->cs_gpios,\n \t\t\t\t\tARRAY_SIZE(priv->cs_gpios), 0);\n \tif (ret < 0) {\n-\t\terror(\"Can't get %s gpios! Error: %d\", bus->name, ret);\n+\t\tpr_err(\"Can't get %s gpios! Error: %d\", bus->name, ret);\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/spi/lpc32xx_ssp.c b/drivers/spi/lpc32xx_ssp.c\nindex c5b766c0dd00..e2a593b93444 100644\n--- a/drivers/spi/lpc32xx_ssp.c\n+++ b/drivers/spi/lpc32xx_ssp.c\n@@ -66,17 +66,17 @@ struct spi_slave *spi_setup_slave(uint bus, uint cs, uint max_hz, uint mode)\n \t/* we only set up SSP0 for now, so ignore bus */\n \n \tif (mode & SPI_3WIRE) {\n-\t\terror(\"3-wire mode not supported\");\n+\t\tpr_err(\"3-wire mode not supported\");\n \t\treturn NULL;\n \t}\n \n \tif (mode & SPI_SLAVE) {\n-\t\terror(\"slave mode not supported\\n\");\n+\t\tpr_err(\"slave mode not supported\\n\");\n \t\treturn NULL;\n \t}\n \n \tif (mode & SPI_PREAMBLE) {\n-\t\terror(\"preamble byte skipping not supported\\n\");\n+\t\tpr_err(\"preamble byte skipping not supported\\n\");\n \t\treturn NULL;\n \t}\n \ndiff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c\nindex 9b58aa8e97b2..bf698a737bd7 100644\n--- a/drivers/sysreset/sysreset_sti.c\n+++ b/drivers/sysreset/sysreset_sti.c\n@@ -39,7 +39,7 @@ static int sti_sysreset_probe(struct udevice *dev)\n \t\t\t\t\t \"st,syscfg\", NULL, 0, 0,\n \t\t\t\t\t &syscfg_phandle);\n \tif (ret < 0) {\n-\t\terror(\"Can't get syscfg phandle: %d\\n\", ret);\n+\t\tpr_err(\"Can't get syscfg phandle: %d\\n\", ret);\n \t\treturn ret;\n \t}\n \n@@ -47,14 +47,14 @@ static int sti_sysreset_probe(struct udevice *dev)\n \t\t\t\t\t syscfg_phandle.node,\n \t\t\t\t\t &syscon);\n \tif (ret) {\n-\t\terror(\"%s: uclass_get_device_by_of_offset failed: %d\\n\",\n+\t\tpr_err(\"%s: uclass_get_device_by_of_offset failed: %d\\n\",\n \t\t __func__, ret);\n \t\treturn ret;\n \t}\n \n \tregmap = syscon_get_regmap(syscon);\n \tif (!regmap) {\n-\t\terror(\"unable to get regmap for %s\\n\", syscon->name);\n+\t\tpr_err(\"unable to get regmap for %s\\n\", syscon->name);\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c\nindex 3818faeb462f..3abce7f67867 100644\n--- a/drivers/sysreset/sysreset_syscon.c\n+++ b/drivers/sysreset/sysreset_syscon.c\n@@ -45,13 +45,13 @@ int syscon_reboot_probe(struct udevice *dev)\n \terr = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,\n \t\t\t\t\t \"regmap\", &syscon);\n \tif (err) {\n-\t\terror(\"unable to find syscon device\\n\");\n+\t\tpr_err(\"unable to find syscon device\\n\");\n \t\treturn err;\n \t}\n \n \tpriv->regmap = syscon_get_regmap(syscon);\n \tif (!priv->regmap) {\n-\t\terror(\"unable to find regmap\\n\");\n+\t\tpr_err(\"unable to find regmap\\n\");\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c\nindex 304ed052a2c3..ab250aea292f 100644\n--- a/drivers/sysreset/sysreset_watchdog.c\n+++ b/drivers/sysreset/sysreset_watchdog.c\n@@ -38,7 +38,7 @@ int wdt_reboot_probe(struct udevice *dev)\n \terr = uclass_get_device_by_phandle(UCLASS_WDT, dev,\n \t\t\t\t\t \"wdt\", &priv->wdt);\n \tif (err) {\n-\t\terror(\"unable to find wdt device\\n\");\n+\t\tpr_err(\"unable to find wdt device\\n\");\n \t\treturn err;\n \t}\n \ndiff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c\nindex ef3ff0dbf67e..e3e20d899689 100644\n--- a/drivers/tpm/tpm_tis_infineon.c\n+++ b/drivers/tpm/tpm_tis_infineon.c\n@@ -539,7 +539,7 @@ static int tpm_tis_i2c_init(struct udevice *dev)\n \t}\n \n \tif (chip->chip_type != UNKNOWN && vendor != expected_did_vid) {\n-\t\terror(\"Vendor id did not match! ID was %08x\\n\", vendor);\n+\t\tpr_err(\"Vendor id did not match! ID was %08x\\n\", vendor);\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c\nindex 35c2dc18d955..e8432bb016eb 100644\n--- a/drivers/usb/common/common.c\n+++ b/drivers/usb/common/common.c\n@@ -28,7 +28,7 @@ enum usb_dr_mode usb_get_dr_mode(int node)\n \n \tdr_mode = fdt_getprop(fdt, node, \"dr_mode\", NULL);\n \tif (!dr_mode) {\n-\t\terror(\"usb dr_mode not found\\n\");\n+\t\tpr_err(\"usb dr_mode not found\\n\");\n \t\treturn USB_DR_MODE_UNKNOWN;\n \t}\n \ndiff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c\nindex 4abef5d5c88e..941d612a68a8 100644\n--- a/drivers/usb/eth/mcs7830.c\n+++ b/drivers/usb/eth/mcs7830.c\n@@ -418,25 +418,25 @@ static int mcs7830_basic_reset(struct usb_device *udev,\n \n \trc = mcs7830_set_autoneg(udev);\n \tif (rc < 0) {\n-\t\terror(\"setting autoneg failed\\n\");\n+\t\tpr_err(\"setting autoneg failed\\n\");\n \t\treturn rc;\n \t}\n \n \trc = mcs7830_write_mchash(udev, priv);\n \tif (rc < 0) {\n-\t\terror(\"failed to set multicast hash\\n\");\n+\t\tpr_err(\"failed to set multicast hash\\n\");\n \t\treturn rc;\n \t}\n \n \trc = mcs7830_write_config(udev, priv);\n \tif (rc < 0) {\n-\t\terror(\"failed to set configuration\\n\");\n+\t\tpr_err(\"failed to set configuration\\n\");\n \t\treturn rc;\n \t}\n \n \trc = mcs7830_apply_fixup(udev);\n \tif (rc < 0) {\n-\t\terror(\"fixup application failed\\n\");\n+\t\tpr_err(\"fixup application failed\\n\");\n \t\treturn rc;\n \t}\n \n@@ -541,11 +541,11 @@ static int mcs7830_recv_common(struct ueth_data *ueth, uint8_t *buf)\n \tdebug(\"%s() RX want len %d, got len %d, rc %d\\n\",\n \t __func__, wantlen, gotlen, rc);\n \tif (rc != 0) {\n-\t\terror(\"RX: failed to receive\\n\");\n+\t\tpr_err(\"RX: failed to receive\\n\");\n \t\treturn rc;\n \t}\n \tif (gotlen > wantlen) {\n-\t\terror(\"RX: got too many bytes (%d)\\n\", gotlen);\n+\t\tpr_err(\"RX: got too many bytes (%d)\\n\", gotlen);\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c\nindex 9df6d32c65f9..ad2f606b78bc 100644\n--- a/drivers/usb/gadget/at91_udc.c\n+++ b/drivers/usb/gadget/at91_udc.c\n@@ -1456,7 +1456,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)\n \n \tret = driver->bind(&udc->gadget);\n \tif (ret) {\n-\t\terror(\"driver->bind() returned %d\\n\", ret);\n+\t\tpr_err(\"driver->bind() returned %d\\n\", ret);\n \t\tudc->driver = NULL;\n \t}\n \n@@ -1468,7 +1468,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)\n \tstruct at91_udc *udc = controller;\n \n \tif (!driver || !driver->unbind || !driver->disconnect) {\n-\t\terror(\"bad paramter\\n\");\n+\t\tpr_err(\"bad paramter\\n\");\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c\nindex ad31703c7376..c0a95a97c9f4 100644\n--- a/drivers/usb/gadget/atmel_usba_udc.c\n+++ b/drivers/usb/gadget/atmel_usba_udc.c\n@@ -1228,7 +1228,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)\n \n \tret = driver->bind(&udc->gadget);\n \tif (ret) {\n-\t\terror(\"driver->bind() returned %d\\n\", ret);\n+\t\tpr_err(\"driver->bind() returned %d\\n\", ret);\n \t\tudc->driver = NULL;\n \t}\n \n@@ -1240,7 +1240,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)\n \tstruct usba_udc *udc = &controller;\n \n \tif (!driver || !driver->unbind || !driver->disconnect) {\n-\t\terror(\"bad paramter\\n\");\n+\t\tpr_err(\"bad paramter\\n\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -1261,7 +1261,7 @@ static struct usba_ep *usba_udc_pdata(struct usba_platform_data *pdata,\n \n \teps = malloc(sizeof(struct usba_ep) * pdata->num_ep);\n \tif (!eps) {\n-\t\terror(\"failed to alloc eps\\n\");\n+\t\tpr_err(\"failed to alloc eps\\n\");\n \t\treturn NULL;\n \t}\n \ndiff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c\nindex cb44374e81a6..088811c19136 100644\n--- a/drivers/usb/gadget/dwc2_udc_otg.c\n+++ b/drivers/usb/gadget/dwc2_udc_otg.c\n@@ -835,7 +835,7 @@ int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata)\n \t\t\t ROUND(sizeof(struct usb_ctrlrequest),\n \t\t\t\t CONFIG_SYS_CACHELINE_SIZE));\n \tif (!usb_ctrl) {\n-\t\terror(\"No memory available for UDC!\\n\");\n+\t\tpr_err(\"No memory available for UDC!\\n\");\n \t\treturn -ENOMEM;\n \t}\n \ndiff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c\nindex 2cf5c8d31e25..2e0ff452d85f 100644\n--- a/drivers/usb/gadget/ether.c\n+++ b/drivers/usb/gadget/ether.c\n@@ -1059,7 +1059,7 @@ static int eth_set_config(struct eth_dev *dev, unsigned number,\n \t\t\t&& dev->config\n \t\t\t&& dev->tx_qlen != 0) {\n \t\t/* tx fifo is full, but we can't clear it...*/\n-\t\terror(\"can't change configurations\");\n+\t\tpr_err(\"can't change configurations\");\n \t\treturn -ESPIPE;\n \t}\n \teth_reset_config(dev);\n@@ -1233,7 +1233,7 @@ static void rndis_command_complete(struct usb_ep *ep, struct usb_request *req)\n \t/* received RNDIS command from USB_CDC_SEND_ENCAPSULATED_COMMAND */\n \tstatus = rndis_msg_parser(dev->rndis_config, (u8 *) req->buf);\n \tif (status < 0)\n-\t\terror(\"%s: rndis parse error %d\", __func__, status);\n+\t\tpr_err(\"%s: rndis parse error %d\", __func__, status);\n }\n \n #endif\t/* RNDIS */\n@@ -1554,7 +1554,7 @@ static int rx_submit(struct eth_dev *dev, struct usb_request *req,\n \tretval = usb_ep_queue(dev->out_ep, req, gfp_flags);\n \n \tif (retval)\n-\t\terror(\"rx submit --> %d\", retval);\n+\t\tpr_err(\"rx submit --> %d\", retval);\n \n \treturn retval;\n }\n@@ -1624,7 +1624,7 @@ static int alloc_requests(struct eth_dev *dev, unsigned n, gfp_t gfp_flags)\n fail2:\n \tusb_ep_free_request(dev->in_ep, dev->tx_req);\n fail1:\n-\terror(\"can't alloc requests\");\n+\tpr_err(\"can't alloc requests\");\n \treturn -1;\n }\n \n@@ -2060,7 +2060,7 @@ static int eth_bind(struct usb_gadget *gadget)\n \t\t * anything less functional on CDC-capable hardware,\n \t\t * so we fail in this case.\n \t\t */\n-\t\terror(\"controller '%s' not recognized\",\n+\t\tpr_err(\"controller '%s' not recognized\",\n \t\t\tgadget->name);\n \t\treturn -ENODEV;\n \t}\n@@ -2121,7 +2121,7 @@ static int eth_bind(struct usb_gadget *gadget)\n \tin_ep = usb_ep_autoconfig(gadget, &fs_source_desc);\n \tif (!in_ep) {\n autoconf_fail:\n-\t\terror(\"can't autoconfigure on %s\\n\",\n+\t\tpr_err(\"can't autoconfigure on %s\\n\",\n \t\t\tgadget->name);\n \t\treturn -ENODEV;\n \t}\n@@ -2142,7 +2142,7 @@ autoconf_fail:\n \t\tif (status_ep) {\n \t\t\tstatus_ep->driver_data = status_ep;\t/* claim */\n \t\t} else if (rndis) {\n-\t\t\terror(\"can't run RNDIS on %s\", gadget->name);\n+\t\t\tpr_err(\"can't run RNDIS on %s\", gadget->name);\n \t\t\treturn -ENODEV;\n #ifdef CONFIG_USB_ETH_CDC\n \t\t} else if (cdc) {\n@@ -2244,7 +2244,7 @@ autoconf_fail:\n \tif (rndis) {\n \t\tstatus = rndis_init();\n \t\tif (status < 0) {\n-\t\t\terror(\"can't init RNDIS, %d\", status);\n+\t\t\tpr_err(\"can't init RNDIS, %d\", status);\n \t\t\tgoto fail;\n \t\t}\n \t}\n@@ -2335,7 +2335,7 @@ fail0:\n \treturn 0;\n \n fail:\n-\terror(\"%s failed, status = %d\", __func__, status);\n+\tpr_err(\"%s failed, status = %d\", __func__, status);\n \teth_unbind(gadget);\n \treturn status;\n }\n@@ -2350,7 +2350,7 @@ int dm_usb_init(struct eth_dev *e_dev)\n \n \tret = uclass_first_device(UCLASS_USB_DEV_GENERIC, &dev);\n \tif (!dev || ret) {\n-\t\terror(\"No USB device found\\n\");\n+\t\tpr_err(\"No USB device found\\n\");\n \t\treturn -ENODEV;\n \t}\n \n@@ -2369,7 +2369,7 @@ static int _usb_eth_init(struct ether_priv *priv)\n \n #ifdef CONFIG_DM_USB\n \tif (dm_usb_init(dev)) {\n-\t\terror(\"USB ether not found\\n\");\n+\t\tpr_err(\"USB ether not found\\n\");\n \t\treturn -ENODEV;\n \t}\n #else\n@@ -2393,11 +2393,11 @@ static int _usb_eth_init(struct ether_priv *priv)\n \t\t\tsizeof(host_addr));\n \n \tif (!is_eth_addr_valid(dev_addr)) {\n-\t\terror(\"Need valid 'usbnet_devaddr' to be set\");\n+\t\tpr_err(\"Need valid 'usbnet_devaddr' to be set\");\n \t\tgoto fail;\n \t}\n \tif (!is_eth_addr_valid(host_addr)) {\n-\t\terror(\"Need valid 'usbnet_hostaddr' to be set\");\n+\t\tpr_err(\"Need valid 'usbnet_hostaddr' to be set\");\n \t\tgoto fail;\n \t}\n \n@@ -2427,7 +2427,7 @@ static int _usb_eth_init(struct ether_priv *priv)\n \twhile (!dev->network_started) {\n \t\t/* Handle control-c and timeouts */\n \t\tif (ctrlc() || (get_timer(ts) > timeout)) {\n-\t\t\terror(\"The remote end did not respond in time.\");\n+\t\t\tpr_err(\"The remote end did not respond in time.\");\n \t\t\tgoto fail;\n \t\t}\n \t\tusb_gadget_handle_interrupts(0);\n@@ -2456,7 +2456,7 @@ static int _usb_eth_send(struct ether_priv *priv, void *packet, int length)\n \t\trndis_pkt = malloc(length +\n \t\t\t\t\tsizeof(struct rndis_packet_msg_type));\n \t\tif (!rndis_pkt) {\n-\t\t\terror(\"No memory to alloc RNDIS packet\");\n+\t\t\tpr_err(\"No memory to alloc RNDIS packet\");\n \t\t\tgoto drop;\n \t\t}\n \t\trndis_add_hdr(rndis_pkt, length);\n@@ -2574,7 +2574,7 @@ static int usb_eth_recv(struct eth_device *netdev)\n \n \tret = _usb_eth_recv(priv);\n \tif (ret) {\n-\t\terror(\"error packet receive\\n\");\n+\t\tpr_err(\"error packet receive\\n\");\n \t\treturn ret;\n \t}\n \n@@ -2585,7 +2585,7 @@ static int usb_eth_recv(struct eth_device *netdev)\n \t\tnet_process_received_packet(net_rx_packets[0],\n \t\t\t\t\t dev->rx_req->length);\n \t} else {\n-\t\terror(\"dev->rx_req invalid\");\n+\t\tpr_err(\"dev->rx_req invalid\");\n \t}\n \tpacket_received = 0;\n \trx_submit(dev, dev->rx_req, 0);\n@@ -2641,7 +2641,7 @@ static int usb_eth_recv(struct udevice *dev, int flags, uchar **packetp)\n \n \tret = _usb_eth_recv(priv);\n \tif (ret) {\n-\t\terror(\"error packet receive\\n\");\n+\t\tpr_err(\"error packet receive\\n\");\n \t\treturn ret;\n \t}\n \n@@ -2650,7 +2650,7 @@ static int usb_eth_recv(struct udevice *dev, int flags, uchar **packetp)\n \t\t\t*packetp = (uchar *)net_rx_packets[0];\n \t\t\treturn ethdev->rx_req->length;\n \t\t} else {\n-\t\t\terror(\"dev->rx_req invalid\");\n+\t\t\tpr_err(\"dev->rx_req invalid\");\n \t\t\treturn -EFAULT;\n \t\t}\n \t}\n@@ -2706,13 +2706,13 @@ int usb_ether_init(void)\n \n \tret = uclass_first_device(UCLASS_USB_DEV_GENERIC, &usb_dev);\n \tif (!usb_dev || ret) {\n-\t\terror(\"No USB device found\\n\");\n+\t\tpr_err(\"No USB device found\\n\");\n \t\treturn ret;\n \t}\n \n \tret = device_bind_driver(usb_dev, \"usb_ether\", \"usb_ether\", &dev);\n \tif (!dev || ret) {\n-\t\terror(\"usb - not able to bind usb_ether device\\n\");\n+\t\tpr_err(\"usb - not able to bind usb_ether device\\n\");\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c\nindex f3382a965bed..7acffb6c87e0 100644\n--- a/drivers/usb/gadget/f_fastboot.c\n+++ b/drivers/usb/gadget/f_fastboot.c\n@@ -410,7 +410,7 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req)\n \n \tstrsep(&cmd, \":\");\n \tif (!cmd) {\n-\t\terror(\"missing variable\");\n+\t\tpr_err(\"missing variable\");\n \t\tfastboot_tx_write_str(\"FAILmissing var\");\n \t\treturn;\n \t}\n@@ -593,7 +593,7 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req)\n \n \tstrsep(&cmd, \":\");\n \tif (!cmd) {\n-\t\terror(\"missing partition name\");\n+\t\tpr_err(\"missing partition name\");\n \t\tfastboot_tx_write_str(\"FAILmissing partition name\");\n \t\treturn;\n \t}\n@@ -645,7 +645,7 @@ static void cb_erase(struct usb_ep *ep, struct usb_request *req)\n \n \tstrsep(&cmd, \":\");\n \tif (!cmd) {\n-\t\terror(\"missing partition name\");\n+\t\tpr_err(\"missing partition name\");\n \t\tfastboot_tx_write_str(\"FAILmissing partition name\");\n \t\treturn;\n \t}\n@@ -718,7 +718,7 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)\n \t}\n \n \tif (!func_cb) {\n-\t\terror(\"unknown command: %.*s\", req->actual, cmdbuf);\n+\t\tpr_err(\"unknown command: %.*s\", req->actual, cmdbuf);\n \t\tfastboot_tx_write_str(\"FAILunknown command\");\n \t} else {\n \t\tif (req->actual < req->length) {\n@@ -726,7 +726,7 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)\n \t\t\tbuf[req->actual] = 0;\n \t\t\tfunc_cb(ep, req);\n \t\t} else {\n-\t\t\terror(\"buffer overflow\");\n+\t\t\tpr_err(\"buffer overflow\");\n \t\t\tfastboot_tx_write_str(\"FAILbuffer overflow\");\n \t\t}\n \t}\ndiff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c\nindex 0fae66beabab..fd3da922a690 100644\n--- a/drivers/usb/gadget/f_sdp.c\n+++ b/drivers/usb/gadget/f_sdp.c\n@@ -237,12 +237,12 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)\n \tu8 report = data[0];\n \n \tif (status != 0) {\n-\t\terror(\"Status: %d\", status);\n+\t\tpr_err(\"Status: %d\", status);\n \t\treturn;\n \t}\n \n \tif (report != 1) {\n-\t\terror(\"Unexpected report %d\", report);\n+\t\tpr_err(\"Unexpected report %d\", report);\n \t\treturn;\n \t}\n \n@@ -309,7 +309,7 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)\n \t\tsdp->next_state = SDP_STATE_IDLE;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Unknown command: %04x\\n\", be16_to_cpu(cmd->cmd));\n+\t\tpr_err(\"Unknown command: %04x\\n\", be16_to_cpu(cmd->cmd));\n \t}\n }\n \n@@ -322,12 +322,12 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)\n \tint datalen = req->length - 1;\n \n \tif (status != 0) {\n-\t\terror(\"Status: %d\", status);\n+\t\tpr_err(\"Status: %d\", status);\n \t\treturn;\n \t}\n \n \tif (report != 2) {\n-\t\terror(\"Unexpected report %d\", report);\n+\t\tpr_err(\"Unexpected report %d\", report);\n \t\treturn;\n \t}\n \n@@ -360,7 +360,7 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)\n \t\tsdp->state = SDP_STATE_TX_SEC_CONF;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Invalid state: %d\", sdp->state);\n+\t\tpr_err(\"Invalid state: %d\", sdp->state);\n \t}\n }\n \n@@ -370,7 +370,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req)\n \tint status = req->status;\n \n \tif (status != 0) {\n-\t\terror(\"Status: %d\", status);\n+\t\tpr_err(\"Status: %d\", status);\n \t\treturn;\n \t}\n \n@@ -393,7 +393,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req)\n \t\t\tsdp->state = SDP_STATE_IDLE;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Wrong State: %d\", sdp->state);\n+\t\tpr_err(\"Wrong State: %d\", sdp->state);\n \t\tsdp->state = SDP_STATE_IDLE;\n \t\tbreak;\n \t}\ndiff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c\nindex cd4d9e659a39..18f233ab5876 100644\n--- a/drivers/usb/gadget/f_thor.c\n+++ b/drivers/usb/gadget/f_thor.c\n@@ -174,7 +174,7 @@ static long long int download_head(unsigned long long total,\n \t\t\t\t\ttransfer_buffer, THOR_STORE_UNIT_SIZE,\n \t\t\t\t\t(*cnt)++);\n \t\t\tif (ret) {\n-\t\t\t\terror(\"DFU write failed [%d] cnt: %d\",\n+\t\t\t\tpr_err(\"DFU write failed [%d] cnt: %d\",\n \t\t\t\t ret, *cnt);\n \t\t\t\treturn ret;\n \t\t\t}\n@@ -218,20 +218,20 @@ static int download_tail(long long int left, int cnt)\n \n \tdfu_entity = dfu_get_entity(alt_setting_num);\n \tif (!dfu_entity) {\n-\t\terror(\"Alt setting: %d entity not found!\\n\", alt_setting_num);\n+\t\tpr_err(\"Alt setting: %d entity not found!\\n\", alt_setting_num);\n \t\treturn -ENOENT;\n \t}\n \n \ttransfer_buffer = dfu_get_buf(dfu_entity);\n \tif (!transfer_buffer) {\n-\t\terror(\"Transfer buffer not allocated!\");\n+\t\tpr_err(\"Transfer buffer not allocated!\");\n \t\treturn -ENXIO;\n \t}\n \n \tif (left) {\n \t\tret = dfu_write(dfu_entity, transfer_buffer, left, cnt++);\n \t\tif (ret) {\n-\t\t\terror(\"DFU write failed [%d]: left: %llu\", ret, left);\n+\t\t\tpr_err(\"DFU write failed [%d]: left: %llu\", ret, left);\n \t\t\treturn ret;\n \t\t}\n \t}\n@@ -245,7 +245,7 @@ static int download_tail(long long int left, int cnt)\n \t */\n \tret = dfu_flush(dfu_entity, transfer_buffer, 0, cnt);\n \tif (ret)\n-\t\terror(\"DFU flush failed!\");\n+\t\tpr_err(\"DFU flush failed!\");\n \n \treturn ret;\n }\n@@ -285,7 +285,7 @@ static long long int process_rqt_download(const struct rqt_box *rqt)\n \n \t\talt_setting_num = dfu_get_alt(f_name);\n \t\tif (alt_setting_num < 0) {\n-\t\t\terror(\"Alt setting [%d] to write not found!\",\n+\t\t\tpr_err(\"Alt setting [%d] to write not found!\",\n \t\t\t alt_setting_num);\n \t\t\trsp->ack = -ENODEV;\n \t\t\tret = rsp->ack;\n@@ -311,7 +311,7 @@ static long long int process_rqt_download(const struct rqt_box *rqt)\n \t\tdebug(\"DL EXIT\\n\");\n \t\tbreak;\n \tdefault:\n-\t\terror(\"Operation not supported: %d\", rqt->rqt_data);\n+\t\tpr_err(\"Operation not supported: %d\", rqt->rqt_data);\n \t\tret = -ENOTSUPP;\n \t}\n \n@@ -342,7 +342,7 @@ static int process_data(void)\n \t\tputs(\"RQT: UPLOAD not supported!\\n\");\n \t\tbreak;\n \tdefault:\n-\t\terror(\"unknown request (%d)\", rqt->rqt);\n+\t\tpr_err(\"unknown request (%d)\", rqt->rqt);\n \t}\n \n \treturn ret;\n@@ -541,7 +541,7 @@ static int thor_rx_data(void)\n \n \t\tstatus = usb_ep_queue(dev->out_ep, dev->out_req, 0);\n \t\tif (status) {\n-\t\t\terror(\"kill %s: resubmit %d bytes --> %d\",\n+\t\t\tpr_err(\"kill %s: resubmit %d bytes --> %d\",\n \t\t\t dev->out_ep->name, dev->out_req->length, status);\n \t\t\tusb_ep_set_halt(dev->out_ep);\n \t\t\treturn -EAGAIN;\n@@ -575,7 +575,7 @@ static void thor_tx_data(unsigned char *data, int len)\n \n \tstatus = usb_ep_queue(dev->in_ep, dev->in_req, 0);\n \tif (status) {\n-\t\terror(\"kill %s: resubmit %d bytes --> %d\",\n+\t\tpr_err(\"kill %s: resubmit %d bytes --> %d\",\n \t\t dev->in_ep->name, dev->in_req->length, status);\n \t\tusb_ep_set_halt(dev->in_ep);\n \t}\n@@ -608,7 +608,7 @@ static void thor_rx_tx_complete(struct usb_ep *ep, struct usb_request *req)\n \tcase -ESHUTDOWN:\t\t/* disconnect from host */\n \tcase -EREMOTEIO: /* short read */\n \tcase -EOVERFLOW:\n-\t\terror(\"ERROR:%d\", status);\n+\t\tpr_err(\"ERROR:%d\", status);\n \t\tbreak;\n \t}\n \n@@ -664,7 +664,7 @@ thor_func_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)\n \t\tbreak;\n \n \tdefault:\n-\t\terror(\"thor_setup: unknown request: %d\", ctrl->bRequest);\n+\t\tpr_err(\"thor_setup: unknown request: %d\", ctrl->bRequest);\n \t}\n \n \tif (value >= 0) {\n@@ -973,7 +973,7 @@ static int thor_func_set_alt(struct usb_function *f,\n \t\tdebug(\"Communication Data interface\\n\");\n \t\tresult = thor_eps_setup(f);\n \t\tif (result)\n-\t\t\terror(\"%s: EPs setup failed!\", __func__);\n+\t\t\tpr_err(\"%s: EPs setup failed!\", __func__);\n \t\tdev->configuration_done = 1;\n \t\tbreak;\n \t}\ndiff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c\nindex 64c42ac47153..56406f2fd3c9 100644\n--- a/drivers/usb/host/dwc2.c\n+++ b/drivers/usb/host/dwc2.c\n@@ -179,7 +179,7 @@ static int dwc_vbus_supply_init(struct udevice *dev)\n \n \tret = regulator_set_enable(vbus_supply, true);\n \tif (ret) {\n-\t\terror(\"Error enabling vbus supply\\n\");\n+\t\tpr_err(\"Error enabling vbus supply\\n\");\n \t\treturn ret;\n \t}\n \ndiff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c\nindex 03f8d321af13..3947124f4044 100644\n--- a/drivers/usb/host/ehci-generic.c\n+++ b/drivers/usb/host/ehci-generic.c\n@@ -51,7 +51,7 @@ static int ehci_usb_probe(struct udevice *dev)\n \t\t\t\tbreak;\n \t\t\terr = clk_enable(&priv->clocks[i]);\n \t\t\tif (err) {\n-\t\t\t\terror(\"failed to enable clock %d\\n\", i);\n+\t\t\t\tpr_err(\"failed to enable clock %d\\n\", i);\n \t\t\t\tclk_free(&priv->clocks[i]);\n \t\t\t\tgoto clk_err;\n \t\t\t}\n@@ -59,7 +59,7 @@ static int ehci_usb_probe(struct udevice *dev)\n \t\t}\n \t} else {\n \t\tif (clock_nb != -ENOENT) {\n-\t\t\terror(\"failed to get clock phandle(%d)\\n\", clock_nb);\n+\t\t\tpr_err(\"failed to get clock phandle(%d)\\n\", clock_nb);\n \t\t\treturn clock_nb;\n \t\t}\n \t}\n@@ -80,7 +80,7 @@ static int ehci_usb_probe(struct udevice *dev)\n \t\t\t\tbreak;\n \n \t\t\tif (reset_deassert(&priv->resets[i])) {\n-\t\t\t\terror(\"failed to deassert reset %d\\n\", i);\n+\t\t\t\tpr_err(\"failed to deassert reset %d\\n\", i);\n \t\t\t\treset_free(&priv->resets[i]);\n \t\t\t\tgoto reset_err;\n \t\t\t}\n@@ -88,7 +88,7 @@ static int ehci_usb_probe(struct udevice *dev)\n \t\t}\n \t} else {\n \t\tif (reset_nb != -ENOENT) {\n-\t\t\terror(\"failed to get reset phandle(%d)\\n\", reset_nb);\n+\t\t\tpr_err(\"failed to get reset phandle(%d)\\n\", reset_nb);\n \t\t\tgoto clk_err;\n \t\t}\n \t}\n@@ -96,14 +96,14 @@ static int ehci_usb_probe(struct udevice *dev)\n \terr = generic_phy_get_by_index(dev, 0, &priv->phy);\n \tif (err) {\n \t\tif (err != -ENOENT) {\n-\t\t\terror(\"failed to get usb phy\\n\");\n+\t\t\tpr_err(\"failed to get usb phy\\n\");\n \t\t\tgoto reset_err;\n \t\t}\n \t} else {\n \n \t\terr = generic_phy_init(&priv->phy);\n \t\tif (err) {\n-\t\t\terror(\"failed to init usb phy\\n\");\n+\t\t\tpr_err(\"failed to init usb phy\\n\");\n \t\t\tgoto reset_err;\n \t\t}\n \t}\n@@ -122,17 +122,17 @@ phy_err:\n \tif (generic_phy_valid(&priv->phy)) {\n \t\tret = generic_phy_exit(&priv->phy);\n \t\tif (ret)\n-\t\t\terror(\"failed to release phy\\n\");\n+\t\t\tpr_err(\"failed to release phy\\n\");\n \t}\n \n reset_err:\n \tret = reset_release_all(priv->resets, priv->reset_count);\n \tif (ret)\n-\t\terror(\"failed to assert all resets\\n\");\n+\t\tpr_err(\"failed to assert all resets\\n\");\n clk_err:\n \tret = clk_release_all(priv->clocks, priv->clock_count);\n \tif (ret)\n-\t\terror(\"failed to disable all clocks\\n\");\n+\t\tpr_err(\"failed to disable all clocks\\n\");\n \n \treturn err;\n }\ndiff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c\nindex e22ee9793914..bf55a71d66c2 100644\n--- a/drivers/usb/host/ohci-generic.c\n+++ b/drivers/usb/host/ohci-generic.c\n@@ -47,14 +47,14 @@ static int ohci_usb_probe(struct udevice *dev)\n \n \t\t\terr = clk_enable(&priv->clocks[i]);\n \t\t\tif (err) {\n-\t\t\t\terror(\"failed to enable clock %d\\n\", i);\n+\t\t\t\tpr_err(\"failed to enable clock %d\\n\", i);\n \t\t\t\tclk_free(&priv->clocks[i]);\n \t\t\t\tgoto clk_err;\n \t\t\t}\n \t\t\tpriv->clock_count++;\n \t\t}\n \t} else if (clock_nb != -ENOENT) {\n-\t\terror(\"failed to get clock phandle(%d)\\n\", clock_nb);\n+\t\tpr_err(\"failed to get clock phandle(%d)\\n\", clock_nb);\n \t\treturn clock_nb;\n \t}\n \n@@ -74,28 +74,28 @@ static int ohci_usb_probe(struct udevice *dev)\n \n \t\t\terr = reset_deassert(&priv->resets[i]);\n \t\t\tif (err) {\n-\t\t\t\terror(\"failed to deassert reset %d\\n\", i);\n+\t\t\t\tpr_err(\"failed to deassert reset %d\\n\", i);\n \t\t\t\treset_free(&priv->resets[i]);\n \t\t\t\tgoto reset_err;\n \t\t\t}\n \t\t\tpriv->reset_count++;\n \t\t}\n \t} else if (reset_nb != -ENOENT) {\n-\t\terror(\"failed to get reset phandle(%d)\\n\", reset_nb);\n+\t\tpr_err(\"failed to get reset phandle(%d)\\n\", reset_nb);\n \t\tgoto clk_err;\n \t}\n \n \terr = generic_phy_get_by_index(dev, 0, &priv->phy);\n \tif (err) {\n \t\tif (err != -ENOENT) {\n-\t\t\terror(\"failed to get usb phy\\n\");\n+\t\t\tpr_err(\"failed to get usb phy\\n\");\n \t\t\tgoto reset_err;\n \t\t}\n \t} else {\n \n \t\terr = generic_phy_init(&priv->phy);\n \t\tif (err) {\n-\t\t\terror(\"failed to init usb phy\\n\");\n+\t\t\tpr_err(\"failed to init usb phy\\n\");\n \t\t\tgoto reset_err;\n \t\t}\n \t}\n@@ -110,17 +110,17 @@ phy_err:\n \tif (generic_phy_valid(&priv->phy)) {\n \t\tret = generic_phy_exit(&priv->phy);\n \t\tif (ret)\n-\t\t\terror(\"failed to release phy\\n\");\n+\t\t\tpr_err(\"failed to release phy\\n\");\n \t}\n \n reset_err:\n \tret = reset_release_all(priv->resets, priv->reset_count);\n \tif (ret)\n-\t\terror(\"failed to assert all resets\\n\");\n+\t\tpr_err(\"failed to assert all resets\\n\");\n clk_err:\n \tret = clk_release_all(priv->clocks, priv->clock_count);\n \tif (ret)\n-\t\terror(\"failed to disable all clocks\\n\");\n+\t\tpr_err(\"failed to disable all clocks\\n\");\n \n \treturn err;\n }\ndiff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c\nindex 4191a894218f..258d1cd00a08 100644\n--- a/drivers/usb/host/xhci-dwc3.c\n+++ b/drivers/usb/host/xhci-dwc3.c\n@@ -128,13 +128,13 @@ static int xhci_dwc3_probe(struct udevice *dev)\n \tret = generic_phy_get_by_index(dev, 0, &plat->usb_phy);\n \tif (ret) {\n \t\tif (ret != -ENOENT) {\n-\t\t\terror(\"Failed to get USB PHY for %s\\n\", dev->name);\n+\t\t\tpr_err(\"Failed to get USB PHY for %s\\n\", dev->name);\n \t\t\treturn ret;\n \t\t}\n \t} else {\n \t\tret = generic_phy_init(&plat->usb_phy);\n \t\tif (ret) {\n-\t\t\terror(\"Can't init USB PHY for %s\\n\", dev->name);\n+\t\t\tpr_err(\"Can't init USB PHY for %s\\n\", dev->name);\n \t\t\treturn ret;\n \t\t}\n \t}\n@@ -161,7 +161,7 @@ static int xhci_dwc3_remove(struct udevice *dev)\n \tif (generic_phy_valid(&plat->usb_phy)) {\n \t\tret = generic_phy_exit(&plat->usb_phy);\n \t\tif (ret) {\n-\t\t\terror(\"Can't deinit USB PHY for %s\\n\", dev->name);\n+\t\t\tpr_err(\"Can't deinit USB PHY for %s\\n\", dev->name);\n \t\t\treturn ret;\n \t\t}\n \t}\ndiff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c\nindex ec55f4e59f75..a72d305df296 100644\n--- a/drivers/usb/host/xhci-rockchip.c\n+++ b/drivers/usb/host/xhci-rockchip.c\n@@ -48,7 +48,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)\n \t */\n \tplat->hcd_base = devfdt_get_addr(dev);\n \tif (plat->hcd_base == FDT_ADDR_T_NONE) {\n-\t\terror(\"Can't get the XHCI register base address\\n\");\n+\t\tpr_err(\"Can't get the XHCI register base address\\n\");\n \t\treturn -ENXIO;\n \t}\n \n@@ -62,7 +62,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)\n \t}\n \n \tif (plat->phy_base == FDT_ADDR_T_NONE) {\n-\t\terror(\"Can't get the usbphy register address\\n\");\n+\t\tpr_err(\"Can't get the usbphy register address\\n\");\n \t\treturn -ENXIO;\n \t}\n \n@@ -119,7 +119,7 @@ static int rockchip_xhci_core_init(struct rockchip_xhci *rkxhci,\n \n \tret = dwc3_core_init(rkxhci->dwc3_reg);\n \tif (ret) {\n-\t\terror(\"failed to initialize core\\n\");\n+\t\tpr_err(\"failed to initialize core\\n\");\n \t\treturn ret;\n \t}\n \n@@ -151,14 +151,14 @@ static int xhci_usb_probe(struct udevice *dev)\n \tif (plat->vbus_supply) {\n \t\tret = regulator_set_enable(plat->vbus_supply, true);\n \t\tif (ret) {\n-\t\t\terror(\"XHCI: failed to set VBus supply\\n\");\n+\t\t\tpr_err(\"XHCI: failed to set VBus supply\\n\");\n \t\t\treturn ret;\n \t\t}\n \t}\n \n \tret = rockchip_xhci_core_init(ctx, dev);\n \tif (ret) {\n-\t\terror(\"XHCI: failed to initialize controller\\n\");\n+\t\tpr_err(\"XHCI: failed to initialize controller\\n\");\n \t\treturn ret;\n \t}\n \n@@ -181,7 +181,7 @@ static int xhci_usb_remove(struct udevice *dev)\n \tif (plat->vbus_supply) {\n \t\tret = regulator_set_enable(plat->vbus_supply, false);\n \t\tif (ret)\n-\t\t\terror(\"XHCI: failed to set VBus supply\\n\");\n+\t\t\tpr_err(\"XHCI: failed to set VBus supply\\n\");\n \t}\n \n \treturn ret;\ndiff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c\nindex de101319cdaa..233857ad7a13 100644\n--- a/drivers/usb/musb-new/ti-musb.c\n+++ b/drivers/usb/musb-new/ti-musb.c\n@@ -106,7 +106,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)\n \t\t\t\t\t\t\t \"mentor,multipoint\",\n \t\t\t\t\t\t\t -1);\n \tif (platdata->musb_config.multipoint < 0) {\n-\t\terror(\"MUSB multipoint DT entry missing\\n\");\n+\t\tpr_err(\"MUSB multipoint DT entry missing\\n\");\n \t\treturn -ENOENT;\n \t}\n \n@@ -115,14 +115,14 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)\n \tplatdata->musb_config.num_eps = fdtdec_get_int(fdt, node,\n \t\t\t\t\t\t \"mentor,num-eps\", -1);\n \tif (platdata->musb_config.num_eps < 0) {\n-\t\terror(\"MUSB num-eps DT entry missing\\n\");\n+\t\tpr_err(\"MUSB num-eps DT entry missing\\n\");\n \t\treturn -ENOENT;\n \t}\n \n \tplatdata->musb_config.ram_bits = fdtdec_get_int(fdt, node,\n \t\t\t\t\t\t\t\"mentor,ram-bits\", -1);\n \tif (platdata->musb_config.ram_bits < 0) {\n-\t\terror(\"MUSB ram-bits DT entry missing\\n\");\n+\t\tpr_err(\"MUSB ram-bits DT entry missing\\n\");\n \t\treturn -ENOENT;\n \t}\n \n@@ -132,7 +132,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)\n \n \tplatdata->plat.power = fdtdec_get_int(fdt, node, \"mentor,power\", -1);\n \tif (platdata->plat.power < 0) {\n-\t\terror(\"MUSB mentor,power DT entry missing\\n\");\n+\t\tpr_err(\"MUSB mentor,power DT entry missing\\n\");\n \t\treturn -ENOENT;\n \t}\n \n@@ -183,7 +183,7 @@ static int ti_musb_host_ofdata_to_platdata(struct udevice *dev)\n \n \tret = ti_musb_ofdata_to_platdata(dev);\n \tif (ret) {\n-\t\terror(\"platdata dt parse error\\n\");\n+\t\tpr_err(\"platdata dt parse error\\n\");\n \t\treturn ret;\n \t}\n \n@@ -229,7 +229,7 @@ static int ti_musb_wrapper_bind(struct udevice *parent)\n \t\t\tret = device_bind_driver_to_node(parent, \"ti-musb-host\",\n \t\t\t\t\tname, offset_to_ofnode(node), &dev);\n \t\t\tif (ret) {\n-\t\t\t\terror(\"musb - not able to bind usb host node\\n\");\n+\t\t\t\tpr_err(\"musb - not able to bind usb host node\\n\");\n \t\t\t\treturn ret;\n \t\t\t}\n \t\t\tbreak;\ndiff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c\nindex bb5cc9788abf..a8b3e747a032 100644\n--- a/drivers/video/am335x-fb.c\n+++ b/drivers/video/am335x-fb.c\n@@ -128,7 +128,7 @@ int am335xfb_init(struct am335x_lcdpanel *panel)\n \t\traster_ctrl |= LCD_TFT_24BPP_MODE;\n \t\tbreak;\n \tdefault:\n-\t\terror(\"am335x-fb: invalid bpp value: %d\\n\", panel->bpp);\n+\t\tpr_err(\"am335x-fb: invalid bpp value: %d\\n\", panel->bpp);\n \t\treturn -1;\n \t}\n \ndiff --git a/env/common.c b/env/common.c\nindex b403bd5f6c12..70715bb6e756 100644\n--- a/env/common.c\n+++ b/env/common.c\n@@ -84,7 +84,7 @@ void set_default_env(const char *s)\n \tif (himport_r(&env_htab, (char *)default_environment,\n \t\t\tsizeof(default_environment), '\\0', flags, 0,\n \t\t\t0, NULL) == 0)\n-\t\terror(\"Environment import failed: errno = %d\\n\", errno);\n+\t\tpr_err(\"Environment import failed: errno = %d\\n\", errno);\n \n \tgd->flags |= GD_FLG_ENV_READY;\n \tgd->flags |= GD_FLG_ENV_DEFAULT;\n@@ -172,7 +172,7 @@ int env_import(const char *buf, int check)\n \t/* Decrypt the env if desired. */\n \tret = env_aes_cbc_crypt(ep, 0);\n \tif (ret) {\n-\t\terror(\"Failed to decrypt env!\\n\");\n+\t\tpr_err(\"Failed to decrypt env!\\n\");\n \t\tset_default_env(\"!import failed\");\n \t\treturn ret;\n \t}\n@@ -183,7 +183,7 @@ int env_import(const char *buf, int check)\n \t\treturn 1;\n \t}\n \n-\terror(\"Cannot import environment: errno = %d\\n\", errno);\n+\tpr_err(\"Cannot import environment: errno = %d\\n\", errno);\n \n \tset_default_env(\"!import failed\");\n \n@@ -247,7 +247,7 @@ int env_export(env_t *env_out)\n \tres = (char *)env_out->data;\n \tlen = hexport_r(&env_htab, '\\0', 0, &res, ENV_SIZE, 0, NULL);\n \tif (len < 0) {\n-\t\terror(\"Cannot export environment: errno = %d\\n\", errno);\n+\t\tpr_err(\"Cannot export environment: errno = %d\\n\", errno);\n \t\treturn 1;\n \t}\n \ndiff --git a/env/sf.c b/env/sf.c\nindex 6f74371c0982..e51b1ae18916 100644\n--- a/env/sf.c\n+++ b/env/sf.c\n@@ -236,7 +236,7 @@ static int env_sf_load(void)\n \n \tret = env_import((char *)ep, 0);\n \tif (!ret) {\n-\t\terror(\"Cannot import environment: errno = %d\\n\", errno);\n+\t\tpr_err(\"Cannot import environment: errno = %d\\n\", errno);\n \t\tset_default_env(\"!env_import failed\");\n \t}\n \ndiff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c\nindex 1d63fc94340e..b16005e6045f 100644\n--- a/fs/jffs2/jffs2_nand_1pass.c\n+++ b/fs/jffs2/jffs2_nand_1pass.c\n@@ -798,7 +798,7 @@ jffs2_1pass_build_lists(struct part_info * part)\n \tstruct mtdids *id = part->dev->id;\n \tmtd = get_nand_dev_by_index(id->num);\n \tif (!mtd) {\n-\t\terror(\"\\nno NAND devices available\\n\");\n+\t\tpr_err(\"\\nno NAND devices available\\n\");\n \t\treturn 0;\n \t}\n \ndiff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c\nindex bd66d31697f5..2a70e4a543e0 100644\n--- a/fs/yaffs2/yaffs_uboot_glue.c\n+++ b/fs/yaffs2/yaffs_uboot_glue.c\n@@ -168,7 +168,7 @@ void cmd_yaffs_devconfig(char *_mp, int flash_dev,\n \n \tmtd = get_nand_dev_by_index(flash_dev);\n \tif (!mtd) {\n-\t\terror(\"\\nno NAND devices available\\n\");\n+\t\tpr_err(\"\\nno NAND devices available\\n\");\n \t\treturn;\n \t}\n \n", "prefixes": [ "U-Boot", "v2", "3/8" ] }