ARM: davinci: Use standard logging styles

Convert printks to pr_<level> and pr_warning to pr_warn.

Other miscellanea:

o Coalesce formats
o Realign arguments
o Use %s, __func__ instead of embedded function names
o Add pr_fmt to mityomapl138 and mux

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index bb680af98374..8fcdcf87c47c 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -183,9 +183,8 @@ static __init void davinci_ntosd2_init(void)
 
         if (HAS_ATA) {
                 if (HAS_NAND)
-                        pr_warning("WARNING: both IDE and Flash are "
-                                "enabled, but they share AEMIF pins.\n"
-                                "\tDisable IDE for NAND/NOR support.\n");
+                        pr_warn("WARNING: both IDE and Flash are enabled, but they share AEMIF pins\n"
+                                "\tDisable IDE for NAND/NOR support\n");
                 davinci_init_ide();
         } else if (HAS_NAND) {
                 davinci_cfg_reg(DM644X_HPIEN_DISABLE);