[PATCH 04/35] arch/blackfin: Convert remaining uses of pr_warning to pr_warn
From: Joe Perches
Date: Fri Feb 17 2017 - 02:20:01 EST
To enable eventual removal of pr_warning
This makes pr_warn use consistent for arch/blackfin
Prior to this patch, there were 11 uses of pr_warning and
0 uses of pr_warn in arch/blackfin
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
arch/blackfin/kernel/nmi.c | 2 +-
arch/blackfin/kernel/ptrace.c | 2 +-
arch/blackfin/mach-bf533/boards/stamp.c | 2 +-
arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +-
arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +-
arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +-
arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 +-
arch/blackfin/mach-bf561/boards/ezkit.c | 2 +-
arch/blackfin/mm/isram-driver.c | 4 ++--
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/blackfin/kernel/nmi.c b/arch/blackfin/kernel/nmi.c
index 9919d29287dc..bc837dc38998 100644
--- a/arch/blackfin/kernel/nmi.c
+++ b/arch/blackfin/kernel/nmi.c
@@ -126,7 +126,7 @@ static inline int nmi_wdt_set_timeout(unsigned long t)
max_t = -1 / sclk;
cnt = t * sclk;
if (t > max_t) {
- pr_warning("NMI: timeout value is too large\n");
+ pr_warn("NMI: timeout value is too large\n");
return -EINVAL;
}
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index 360d99645163..28dbbaf79896 100644
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -98,7 +98,7 @@ put_reg(struct task_struct *task, unsigned long regno, unsigned long data)
break;
case PT_SYSCFG: /* don't let userspace screw with this */
if ((data & ~1) != 0x6)
- pr_warning("ptrace: ignore syscfg write of %#lx\n", data);
+ pr_warn("ptrace: ignore syscfg write of %#lx\n", data);
break; /* regs->syscfg = data; break; */
default:
if (regno < sizeof(*regs)) {
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 23eada79439c..365fed0c7685 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -869,7 +869,7 @@ static int __init stamp_init(void)
#endif
if (net2272_init())
- pr_warning("unable to configure net2272; it probably won't work\n");
+ pr_warn("unable to configure net2272; it probably won't work\n");
spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
return 0;
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index 1e1014df5e9e..8c5250da0577 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -904,7 +904,7 @@ static int __init cm_bf537e_init(void)
#endif
if (net2272_init())
- pr_warning("unable to configure net2272; it probably won't work\n");
+ pr_warn("unable to configure net2272; it probably won't work\n");
return 0;
}
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index d056db9e5592..5cb4808a3304 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
@@ -761,7 +761,7 @@ static int __init cm_bf537u_init(void)
#endif
if (net2272_init())
- pr_warning("unable to configure net2272; it probably won't work\n");
+ pr_warn("unable to configure net2272; it probably won't work\n");
return 0;
}
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index eaec7b4832a2..f9168094427b 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -2964,7 +2964,7 @@ static int __init stamp_init(void)
spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
if (net2272_init())
- pr_warning("unable to configure net2272; it probably won't work\n");
+ pr_warn("unable to configure net2272; it probably won't work\n");
return 0;
}
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index ed309c9a62b6..de4a4d705527 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -751,7 +751,7 @@ static int __init tcm_bf537_init(void)
#endif
if (net2272_init())
- pr_warning("unable to configure net2272; it probably won't work\n");
+ pr_warn("unable to configure net2272; it probably won't work\n");
return 0;
}
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 10c57771822d..f95ca2026cc4 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -533,7 +533,7 @@ static int __init cm_bf561_init(void)
#endif
if (net2272_init())
- pr_warning("unable to configure net2272; it probably won't work\n");
+ pr_warn("unable to configure net2272; it probably won't work\n");
return 0;
}
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 57d1c43726d9..0c640286c8bd 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -654,7 +654,7 @@ static int __init ezkit_init(void)
#endif
if (net2272_init())
- pr_warning("unable to configure net2272; it probably won't work\n");
+ pr_warn("unable to configure net2272; it probably won't work\n");
spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
return 0;
diff --git a/arch/blackfin/mm/isram-driver.c b/arch/blackfin/mm/isram-driver.c
index 7e2e674ed444..020c706fee28 100644
--- a/arch/blackfin/mm/isram-driver.c
+++ b/arch/blackfin/mm/isram-driver.c
@@ -363,7 +363,7 @@ static __init int isram_test_init(void)
break;
}
if (!l1inst) {
- pr_warning("SKIP: could not allocate L1 inst\n");
+ pr_warn("SKIP: could not allocate L1 inst\n");
return 0;
}
pr_info("INFO: testing %#x bytes (%p - %p)\n",
@@ -372,7 +372,7 @@ static __init int isram_test_init(void)
sdram = kmalloc(test_len * 2, GFP_KERNEL);
if (!sdram) {
sram_free(l1inst);
- pr_warning("SKIP: could not allocate sdram\n");
+ pr_warn("SKIP: could not allocate sdram\n");
return 0;
}
--
2.10.0.rc2.1.g053435c