redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Gregory Fong 2015-10-14 04:27:38 -07:00 committed by Ralf Baechle
parent 5361832704
commit 63893ea530
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/mips/bcm63xx/boards/board_bcm963xx.c
View File

@ -7,6 +7,8 @@
* Copyright (C) 2008 Florian Fainelli <florian@openwrt.org> * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
@ -31,7 +33,6 @@
#include <uapi/linux/bcm933xx_hcs.h> #include <uapi/linux/bcm933xx_hcs.h>
#define PFX "board_bcm963xx: "
#define HCS_OFFSET_128K 0x20000 #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)); memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));
return 0; return 0;
} else { } 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; return -EINVAL;
} }
} }
@ -784,7 +785,7 @@ void __init board_prom_init(void)
cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]); cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
else else
strcpy(cfe_version, "unknown"); 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); bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);
@ -808,8 +809,7 @@ void __init board_prom_init(void)
char name[17]; char name[17];
memcpy(name, board_name, 16); memcpy(name, board_name, 16);
name[16] = 0; name[16] = 0;
printk(KERN_ERR PFX "unknown bcm963xx board: %s\n", pr_err("unknown bcm963xx board: %s\n", name);
name);
return; return;
} }
@ -854,7 +854,7 @@ void __init board_setup(void)
{ {
if (!board.name[0]) if (!board.name[0])
panic("unable to detect bcm963xx board"); 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 */ /* make sure we're running on expected cpu */
if (bcm63xx_get_cpu_id() != board.expected_cpu_id) 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); memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
if (ssb_arch_register_fallback_sprom( if (ssb_arch_register_fallback_sprom(
&bcm63xx_get_fallback_sprom) < 0) &bcm63xx_get_fallback_sprom) < 0)
pr_err(PFX "failed to register fallback SPROM\n"); pr_err("failed to register fallback SPROM\n");
} }
#endif #endif

12
arch/mips/bcm63xx/cpu.c
View File

@ -376,10 +376,10 @@ void __init bcm63xx_cpu_init(void)
bcm63xx_cpu_freq = detect_cpu_clock(); bcm63xx_cpu_freq = detect_cpu_clock();
bcm63xx_memory_size = detect_memory_size(); bcm63xx_memory_size = detect_memory_size();
printk(KERN_INFO "Detected Broadcom 0x%04x CPU revision %02x\n", pr_info("Detected Broadcom 0x%04x CPU revision %02x\n",
bcm63xx_cpu_id, bcm63xx_cpu_rev); bcm63xx_cpu_id, bcm63xx_cpu_rev);
printk(KERN_INFO "CPU frequency is %u MHz\n", pr_info("CPU frequency is %u MHz\n",
bcm63xx_cpu_freq / 1000000); bcm63xx_cpu_freq / 1000000);
printk(KERN_INFO "%uMB of RAM installed\n", pr_info("%uMB of RAM installed\n",
bcm63xx_memory_size >> 20); bcm63xx_memory_size >> 20);
} }

2
arch/mips/bcm63xx/dev-pcmcia.c
View File

@ -139,6 +139,6 @@ int __init bcm63xx_pcmcia_register(void)
return platform_device_register(&bcm63xx_pcmcia_device); return platform_device_register(&bcm63xx_pcmcia_device);
out_err: out_err:
printk(KERN_ERR "unable to set pcmcia chip select\n"); pr_err("unable to set pcmcia chip select\n");
return ret; return ret;
} }

2
arch/mips/bcm63xx/irq.c
View File

@ -311,7 +311,7 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
break; break;
default: default:
printk(KERN_ERR "bogus flow type combination given !\n"); pr_err("bogus flow type combination given !\n");
return -EINVAL; return -EINVAL;
} }

8
arch/mips/bcm63xx/setup.c
View File

@ -24,7 +24,7 @@
void bcm63xx_machine_halt(void) void bcm63xx_machine_halt(void)
{ {
printk(KERN_INFO "System halted\n"); pr_info("System halted\n");
while (1) while (1)
; ;
} }
@ -34,7 +34,7 @@ static void bcm6348_a1_reboot(void)
u32 reg; u32 reg;
/* soft reset all blocks */ /* 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 = bcm_perf_readl(PERF_SOFTRESET_REG);
reg &= ~SOFTRESET_6348_ALL; reg &= ~SOFTRESET_6348_ALL;
bcm_perf_writel(reg, PERF_SOFTRESET_REG); bcm_perf_writel(reg, PERF_SOFTRESET_REG);
@ -46,7 +46,7 @@ static void bcm6348_a1_reboot(void)
mdelay(10); mdelay(10);
/* Jump to the power on address. */ /* 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 high vectors (base at 0xbfc00000 */
set_c0_status(ST0_BEV | ST0_ERL); set_c0_status(ST0_BEV | ST0_ERL);
/* run uncached in kseg0 */ /* run uncached in kseg0 */
@ -110,7 +110,7 @@ void bcm63xx_machine_reboot(void)
if (BCMCPU_IS_6348() && (bcm63xx_get_cpu_rev() == 0xa1)) if (BCMCPU_IS_6348() && (bcm63xx_get_cpu_rev() == 0xa1))
bcm6348_a1_reboot(); bcm6348_a1_reboot();
printk(KERN_INFO "triggering watchdog soft-reset...\n"); pr_info("triggering watchdog soft-reset...\n");
if (BCMCPU_IS_6328()) { if (BCMCPU_IS_6328()) {
bcm_wdt_writel(1, WDT_SOFTRESET_REG); bcm_wdt_writel(1, WDT_SOFTRESET_REG);
} else { } else {

2
arch/mips/bcm63xx/timer.c
View File

@ -195,7 +195,7 @@ int bcm63xx_timer_init(void)
irq = bcm63xx_get_irq_number(IRQ_TIMER); irq = bcm63xx_get_irq_number(IRQ_TIMER);
ret = request_irq(irq, timer_interrupt, 0, "bcm63xx_timer", NULL); ret = request_irq(irq, timer_interrupt, 0, "bcm63xx_timer", NULL);
if (ret) { if (ret) {
printk(KERN_ERR "bcm63xx_timer: failed to register irq\n"); pr_err("%s: failed to register irq\n", __func__);
return ret; return ret;
} }