MIPS: BCM63XX: Use pr_* instead of printk

Signed-off-by: Gregory Fong <gregory.0xf0@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: Joe Perches <joe@perches.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Nicolas Schichan <nschichan@freebox.fr>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11300/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 33727e7f0c79f756a004dc4d5fd964b31b3d6058..b2097c0d2ed78b554ab321c6620767d3ccd29f71 100644 (file)
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -7,6 +7,8 @@
  * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -31,7 +33,6 @@
 
 #include <uapi/linux/bcm933xx_hcs.h>
 
-#define PFX    "board_bcm963xx: "
 
 #define HCS_OFFSET_128K                        0x20000
 
@@ -740,7 +741,7 @@ int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
                memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));
                return 0;
        } else {
-               printk(KERN_ERR PFX "unable to fill SPROM for given bustype.\n");
+               pr_err("unable to fill SPROM for given bustype\n");
                return -EINVAL;
        }
 }
@@ -784,7 +785,7 @@ void __init board_prom_init(void)
                         cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
        else
                strcpy(cfe_version, "unknown");
-       printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
+       pr_info("CFE version: %s\n", cfe_version);
 
        bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);
 
@@ -808,8 +809,7 @@ void __init board_prom_init(void)
                char name[17];
                memcpy(name, board_name, 16);
                name[16] = 0;
-               printk(KERN_ERR PFX "unknown bcm963xx board: %s\n",
-                      name);
+               pr_err("unknown bcm963xx board: %s\n", name);
                return;
        }
 
@@ -854,7 +854,7 @@ void __init board_setup(void)
 {
        if (!board.name[0])
                panic("unable to detect bcm963xx board");
-       printk(KERN_INFO PFX "board name: %s\n", board.name);
+       pr_info("board name: %s\n", board.name);
 
        /* make sure we're running on expected cpu */
        if (bcm63xx_get_cpu_id() != board.expected_cpu_id)
@@ -910,7 +910,7 @@ int __init board_register_devices(void)
                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
                if (ssb_arch_register_fallback_sprom(
                                &bcm63xx_get_fallback_sprom) < 0)
-                       pr_err(PFX "failed to register fallback SPROM\n");
+                       pr_err("failed to register fallback SPROM\n");
        }
 #endif
 

diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
index 307ec8b8e41c1eb12129844c9744ed9dd9441fb7..1c7c3fbfa1f330afae049d30e48b731cd6b46499 100644 (file)
--- a/arch/mips/bcm63xx/cpu.c
+++ b/arch/mips/bcm63xx/cpu.c
@@ -376,10 +376,10 @@ void __init bcm63xx_cpu_init(void)
        bcm63xx_cpu_freq = detect_cpu_clock();
        bcm63xx_memory_size = detect_memory_size();
 
-       printk(KERN_INFO "Detected Broadcom 0x%04x CPU revision %02x\n",
-              bcm63xx_cpu_id, bcm63xx_cpu_rev);
-       printk(KERN_INFO "CPU frequency is %u MHz\n",
-              bcm63xx_cpu_freq / 1000000);
-       printk(KERN_INFO "%uMB of RAM installed\n",
-              bcm63xx_memory_size >> 20);
+       pr_info("Detected Broadcom 0x%04x CPU revision %02x\n",
+               bcm63xx_cpu_id, bcm63xx_cpu_rev);
+       pr_info("CPU frequency is %u MHz\n",
+               bcm63xx_cpu_freq / 1000000);
+       pr_info("%uMB of RAM installed\n",
+               bcm63xx_memory_size >> 20);
 }

diff --git a/arch/mips/bcm63xx/dev-pcmcia.c b/arch/mips/bcm63xx/dev-pcmcia.c
index a551bab5ecb94b2aafce31787cea8e6bb31dbd10..9496cd23695149d992e254e7ad2830d9d9860719 100644 (file)
--- a/arch/mips/bcm63xx/dev-pcmcia.c
+++ b/arch/mips/bcm63xx/dev-pcmcia.c
@@ -139,6 +139,6 @@ int __init bcm63xx_pcmcia_register(void)
        return platform_device_register(&bcm63xx_pcmcia_device);
 
 out_err:
-       printk(KERN_ERR "unable to set pcmcia chip select\n");
+       pr_err("unable to set pcmcia chip select\n");
        return ret;
 }

diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c
index 1a47ec2a09062b59bf76b1b4de9270435698b88e..c96139097ae270c9fbf6252d086611159bd6503d 100644 (file)
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
@@ -311,7 +311,7 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
                break;
 
        default:
-               printk(KERN_ERR "bogus flow type combination given !\n");
+               pr_err("bogus flow type combination given !\n");
                return -EINVAL;
        }
 

diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
index 240fb4ffa55c8625ef26354e29cff25c58f63b68..2be9caaa208530757af7ab41eaa6104c9a0616da 100644 (file)
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -24,7 +24,7 @@
 
 void bcm63xx_machine_halt(void)
 {
-       printk(KERN_INFO "System halted\n");
+       pr_info("System halted\n");
        while (1)
                ;
 }
@@ -34,7 +34,7 @@ static void bcm6348_a1_reboot(void)
        u32 reg;
 
        /* soft reset all blocks */
-       printk(KERN_INFO "soft-resetting all blocks ...\n");
+       pr_info("soft-resetting all blocks ...\n");
        reg = bcm_perf_readl(PERF_SOFTRESET_REG);
        reg &= ~SOFTRESET_6348_ALL;
        bcm_perf_writel(reg, PERF_SOFTRESET_REG);
@@ -46,7 +46,7 @@ static void bcm6348_a1_reboot(void)
        mdelay(10);
 
        /* Jump to the power on address. */
-       printk(KERN_INFO "jumping to reset vector.\n");
+       pr_info("jumping to reset vector.\n");
        /* set high vectors (base at 0xbfc00000 */
        set_c0_status(ST0_BEV | ST0_ERL);
        /* run uncached in kseg0 */
@@ -110,7 +110,7 @@ void bcm63xx_machine_reboot(void)
        if (BCMCPU_IS_6348() && (bcm63xx_get_cpu_rev() == 0xa1))
                bcm6348_a1_reboot();
 
-       printk(KERN_INFO "triggering watchdog soft-reset...\n");
+       pr_info("triggering watchdog soft-reset...\n");
        if (BCMCPU_IS_6328()) {
                bcm_wdt_writel(1, WDT_SOFTRESET_REG);
        } else {

diff --git a/arch/mips/bcm63xx/timer.c b/arch/mips/bcm63xx/timer.c
index 5f11359815688d5350a56cce5704971e4e533b1a..2110359c00e5cb79cf1b04b21c73c83e81f79ea8 100644 (file)
--- a/arch/mips/bcm63xx/timer.c
+++ b/arch/mips/bcm63xx/timer.c
@@ -195,7 +195,7 @@ int bcm63xx_timer_init(void)
        irq = bcm63xx_get_irq_number(IRQ_TIMER);
        ret = request_irq(irq, timer_interrupt, 0, "bcm63xx_timer", NULL);
        if (ret) {
-               printk(KERN_ERR "bcm63xx_timer: failed to register irq\n");
+               pr_err("%s: failed to register irq\n", __func__);
                return ret;
        }