summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-26 14:21:36 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-29 03:50:16 +0900
commita54c879a423959b475f6f67c4cbf1c744e08849a (patch)
tree1c86cdf4ca3ee205fd7f1e1ca3cc9ad7fcbf773a /arch
parent59fe23c2e0bc442c9344852425155f0d683e217c (diff)
ARM: uniphier: use pr_err() where possible
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-uniphier/dram/umc-ph1-pro4.c2
-rw-r--r--arch/arm/mach-uniphier/dram/umc-proxstream2.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c b/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
index 16c82645c46..ff988e35404 100644
--- a/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
@@ -82,7 +82,7 @@ static int umc_dramcont_init(void __iomem *dramcont, void __iomem *ca_base,
dram_size = DRAM_SZ_512M;
break;
default:
- printf("unsupported DRAM size\n");
+ pr_err("unsupported DRAM size\n");
return -EINVAL;
}
diff --git a/arch/arm/mach-uniphier/dram/umc-proxstream2.c b/arch/arm/mach-uniphier/dram/umc-proxstream2.c
index dca34ba78bd..d98765b2ac8 100644
--- a/arch/arm/mach-uniphier/dram/umc-proxstream2.c
+++ b/arch/arm/mach-uniphier/dram/umc-proxstream2.c
@@ -344,7 +344,7 @@ static int __ddrphy_training(void __iomem *phy_base,
do {
if (--timeout < 0) {
- printf("%s: error: timeout during DDR training\n",
+ pr_err("%s: error: timeout during DDR training\n",
__func__);
return -ETIMEDOUT;
}
@@ -354,7 +354,7 @@ static int __ddrphy_training(void __iomem *phy_base,
for (s = seq; s->description; s++) {
if (pgsr0 & s->err_flag) {
- printf("%s: error: %s failed\n", __func__,
+ pr_err("%s: error: %s failed\n", __func__,
s->description);
return -EIO;
}
@@ -597,7 +597,7 @@ int proxstream2_umc_init(const struct uniphier_board_data *bd)
freq = FREQ_2133M;
break;
default:
- printf("unsupported DRAM frequency %d MHz\n", bd->dram_freq);
+ pr_err("unsupported DRAM frequency %d MHz\n", bd->dram_freq);
return -EINVAL;
}
@@ -606,7 +606,7 @@ int proxstream2_umc_init(const struct uniphier_board_data *bd)
bd->dram_ch[ch].size / SZ_256M,
bd->dram_ch[ch].width);
if (ret) {
- printf("failed to initialize UMC ch%d\n", ch);
+ pr_err("failed to initialize UMC ch%d\n", ch);
return ret;
}