aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/generic
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-10-04 12:50:42 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-11-24 01:44:51 -0500
commit7178d2cdd9f5f70902dd0201ebcf01c9489c4afb (patch)
tree3fe2fbb9996549586e567aa06c17a5ed38515d57 /arch/mips/txx9/generic
parente5067c718b3a6ecc00351861b3655d8cdeb0b6d2 (diff)
mips: Convert pr_warning to pr_warn
Use the much more common pr_warn instead of pr_warning with the goal of removing pr_warning eventually. Other miscellanea: o Coalesce formats o Realign arguments Signed-off-by: Joe Perches <joe@perches.com> Cc: linux-mips <linux-mips@linux-mips.org> Cc: LKML <linux-kernel@vger.kernel.org> Patchwork: https://patchwork.linux-mips.org/patch/7935/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/txx9/generic')
-rw-r--r--arch/mips/txx9/generic/setup_tx4927.c4
-rw-r--r--arch/mips/txx9/generic/setup_tx4938.c4
-rw-r--r--arch/mips/txx9/generic/setup_tx4939.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/txx9/generic/setup_tx4927.c b/arch/mips/txx9/generic/setup_tx4927.c
index e714d6ce9a82..a4664cb6c1e1 100644
--- a/arch/mips/txx9/generic/setup_tx4927.c
+++ b/arch/mips/txx9/generic/setup_tx4927.c
@@ -29,8 +29,8 @@ static void __init tx4927_wdr_init(void)
29{ 29{
30 /* report watchdog reset status */ 30 /* report watchdog reset status */
31 if (____raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_WDRST) 31 if (____raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_WDRST)
32 pr_warning("Watchdog reset detected at 0x%lx\n", 32 pr_warn("Watchdog reset detected at 0x%lx\n",
33 read_c0_errorepc()); 33 read_c0_errorepc());
34 /* clear WatchDogReset (W1C) */ 34 /* clear WatchDogReset (W1C) */
35 tx4927_ccfg_set(TX4927_CCFG_WDRST); 35 tx4927_ccfg_set(TX4927_CCFG_WDRST);
36 /* do reset on watchdog */ 36 /* do reset on watchdog */
diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c
index 0a3bf2dfaba1..58cdb2aba5e1 100644
--- a/arch/mips/txx9/generic/setup_tx4938.c
+++ b/arch/mips/txx9/generic/setup_tx4938.c
@@ -31,8 +31,8 @@ static void __init tx4938_wdr_init(void)
31{ 31{
32 /* report watchdog reset status */ 32 /* report watchdog reset status */
33 if (____raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_WDRST) 33 if (____raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_WDRST)
34 pr_warning("Watchdog reset detected at 0x%lx\n", 34 pr_warn("Watchdog reset detected at 0x%lx\n",
35 read_c0_errorepc()); 35 read_c0_errorepc());
36 /* clear WatchDogReset (W1C) */ 36 /* clear WatchDogReset (W1C) */
37 tx4938_ccfg_set(TX4938_CCFG_WDRST); 37 tx4938_ccfg_set(TX4938_CCFG_WDRST);
38 /* do reset on watchdog */ 38 /* do reset on watchdog */
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index b7eccbd17bf7..e3733cde50d6 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -35,8 +35,8 @@ static void __init tx4939_wdr_init(void)
35{ 35{
36 /* report watchdog reset status */ 36 /* report watchdog reset status */
37 if (____raw_readq(&tx4939_ccfgptr->ccfg) & TX4939_CCFG_WDRST) 37 if (____raw_readq(&tx4939_ccfgptr->ccfg) & TX4939_CCFG_WDRST)
38 pr_warning("Watchdog reset detected at 0x%lx\n", 38 pr_warn("Watchdog reset detected at 0x%lx\n",
39 read_c0_errorepc()); 39 read_c0_errorepc());
40 /* clear WatchDogReset (W1C) */ 40 /* clear WatchDogReset (W1C) */
41 tx4939_ccfg_set(TX4939_CCFG_WDRST); 41 tx4939_ccfg_set(TX4939_CCFG_WDRST);
42 /* do reset on watchdog */ 42 /* do reset on watchdog */