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, 4 insertions, 6 deletions

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index e583e58b5e1e..1a0898c1c17e 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -767,9 +767,8 @@ static __init void davinci_evm_init(void)
 
         if (HAS_ATA) {
                 if (HAS_NAND || HAS_NOR)
-                        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 || HAS_NOR) {
                 davinci_cfg_reg(DM644X_HPIEN_DISABLE);
@@ -780,13 +779,12 @@ static __init void davinci_evm_init(void)
                         platform_device_register(&davinci_evm_nandflash_device);
 
                         if (davinci_aemif_setup(&davinci_evm_nandflash_device))
-                                pr_warn("%s: Cannot configure AEMIF.\n",
+                                pr_warn("%s: Cannot configure AEMIF\n",
                                         __func__);
 
                         evm_leds[7].default_trigger = "nand-disk";
                         if (HAS_NOR)
-                                pr_warning("WARNING: both NAND and NOR flash "
-                                        "are enabled; disable one of them.\n");
+                                pr_warn("WARNING: both NAND and NOR flash are enabled; disable one of them.\n");
                 } else if (HAS_NOR)
                         platform_device_register(&davinci_evm_norflash_device);
         }