[PATCH] printk: Use symbolic defines for console loglevels instead of numbers

From: Alexander Kuleshov
Date: Mon Mar 16 2015 - 05:01:51 EST


Signed-off-by: Alexander Kuleshov <kuleshovmail@xxxxxxxxx>
---
arch/arm/mach-omap2/serial.c | 2 +-
arch/m68k/mac/macints.c | 2 +-
arch/m68k/mac/oss.c | 4 ++--
arch/powerpc/kernel/udbg.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 57dee0c..5fb50fe 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -203,7 +203,7 @@ static int __init omap_serial_early_init(void)
if (cmdline_find_option(uart_name)) {
console_uart_id = uart->num;

- if (console_loglevel >= 10) {
+ if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) {
uart_debug = true;
pr_info("%s used as console in debug mode: uart%d clocks will not be gated",
uart_name, uart->num);
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 5c1a6b2..8996da9 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -315,7 +315,7 @@ irqreturn_t mac_nmi_handler(int irq, void *dev_id)
while (nmi_hold == 1)
udelay(1000);

- if (console_loglevel >= 8) {
+ if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) {
#if 0
struct pt_regs *fp = get_irq_regs();
show_state();
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 5403712..f38fcbf 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -70,7 +70,7 @@ static void oss_irq(unsigned int irq, struct irq_desc *desc)
(OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM);

#ifdef DEBUG_IRQS
- if ((console_loglevel == 10) && !(events & OSS_IP_SCSI)) {
+ if ((console_loglevel == CONSOLE_LOGLEVEL_DEBUG) && !(events & OSS_IP_SCSI)) {
printk("oss_irq: irq %u events = 0x%04X\n", irq,
(int) oss->irq_pending);
}
@@ -107,7 +107,7 @@ static void oss_nubus_irq(unsigned int irq, struct irq_desc *desc)
return;

#ifdef DEBUG_NUBUS_INT
- if (console_loglevel > 7) {
+ if (console_loglevel > CONSOLE_LOGLEVEL_DEFAULT) {
printk("oss_nubus_irq: events = 0x%04X\n", events);
}
#endif
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index b7aa072..5525a85 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -76,7 +76,7 @@ void __init udbg_early_init(void)
#endif

#ifdef CONFIG_PPC_EARLY_DEBUG
- console_loglevel = 10;
+ console_loglevel = CONSOLE_LOGLEVEL_DEBUG;

register_early_udbg_console();
#endif
--
2.3.3.472.g20ceeac.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/