nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

bcma: Use bcma_debug and not pr_cont in MIPS driver

Browse source 
Commit 66cc044249 ("bcma: use bcma_debug and pr_cont in MIPS driver")
converted a printk(KERN_DEBUG to bcma_debug.

bcma_debug is guarded by a #define DEBUG via pr_debug.

This means that the bcma_debug will generally not be emitted
but any pr_cont following the bcma_debug will be emitted.

Correct this by removing the uses of pr_cont by using a temporary.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Joe Perches 2017-10-18 22:45:27 -07:00 committed by Kalle Valo
parent ad1987d673
commit 758f7e0606
1 changed files with 7 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/bcma/driver_mips.c
View file

@ -184,11 +184,14 @@ static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq)
{ {
int i; int i;
static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"}; static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
char interrupts[20];
char *ints = interrupts;
bcma_debug(dev->bus, "core 0x%04x, irq :", dev->id.id); for (i = 0; i < ARRAY_SIZE(irq_name); i++)
for (i = 0; i <= 6; i++) ints += sprintf(ints, " %s%c",
pr_cont(" %s%s", irq_name[i], i == irq ? "*" : " "); irq_name[i], i == irq ? '*' : ' ');
pr_cont("\n");
bcma_debug(dev->bus, "core 0x%04x, irq:%s\n", dev->id.id, interrupts);
} }
static void bcma_core_mips_dump_irq(struct bcma_bus *bus) static void bcma_core_mips_dump_irq(struct bcma_bus *bus)