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

From: Alexander Kuleshov
Date: Tue Mar 17 2015 - 06:38:15 EST


<linux/printk.h> provides macros for console log level, let's use it
instead of numbers.

Previously there were checks for console_loglevel 8, which are supposed
to be above default console log level and will be used for debug.
So let's use CONSOLE_LOGLEVEL_DEBUG macro instead.

Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Alexander Kuleshov <kuleshovmail@xxxxxxxxx>
---
arch/m68k/mac/macints.c | 2 +-
arch/m68k/mac/oss.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

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..279a7b1 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_DEBUG) {
printk("oss_nubus_irq: events = 0x%04X\n", events);
}
#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/