kernel/printk: use symbolic defines for console loglevels

[mirror_ubuntu-zesty-kernel.git] / drivers / nubus / nubus.c

diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c
index 43926cd25ae81fbef6ea0d72e10b95466621ee5b..5066a7ef7b6c38a2064c69003bff4f90b481293e 100644 (file)
--- a/drivers/nubus/nubus.c
+++ b/drivers/nubus/nubus.c
@@ -473,7 +473,7 @@ static struct nubus_dev* __init
        if (slot == 0 && (unsigned long)dir.base % 2)
                dir.base += 1;
        
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_DEBUG "nubus_get_functional_resource: parent is 0x%p, dir is 0x%p\n",
                       parent->base, dir.base);
 
@@ -568,7 +568,7 @@ static int __init nubus_get_vidnames(struct nubus_board* board,
 
        printk(KERN_INFO "    video modes supported:\n");
        nubus_get_subdir(parent, &dir);
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_DEBUG "nubus_get_vidnames: parent is 0x%p, dir is 0x%p\n",
                       parent->base, dir.base);
 
@@ -629,7 +629,7 @@ static int __init nubus_get_vendorinfo(struct nubus_board* board,
 
        printk(KERN_INFO "    vendor info:\n");
        nubus_get_subdir(parent, &dir);
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_DEBUG "nubus_get_vendorinfo: parent is 0x%p, dir is 0x%p\n",
                       parent->base, dir.base);
 
@@ -654,7 +654,7 @@ static int __init nubus_get_board_resource(struct nubus_board* board, int slot,
        struct nubus_dirent ent;
        
        nubus_get_subdir(parent, &dir);
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_DEBUG "nubus_get_board_resource: parent is 0x%p, dir is 0x%p\n",
                       parent->base, dir.base);
 
@@ -753,19 +753,19 @@ static void __init nubus_find_rom_dir(struct nubus_board* board)
        if (nubus_readdir(&dir, &ent) == -1)
                goto badrom;
 
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_INFO "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
        /* This one takes us to where we want to go. */
        if (nubus_readdir(&dir, &ent) == -1) 
                goto badrom;
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
        nubus_get_subdir(&ent, &dir);
 
        /* Resource ID 01, also an "Unknown Macintosh" */
        if (nubus_readdir(&dir, &ent) == -1) 
                goto badrom;
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
 
        /* FIXME: the first one is *not* always the right one.  We
@@ -780,7 +780,7 @@ static void __init nubus_find_rom_dir(struct nubus_board* board)
           path to that address... */
        if (nubus_readdir(&dir, &ent) == -1)
                goto badrom;
-       if (console_loglevel >= 10)
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
        
        /* Bwahahahaha... */
@@ -816,7 +816,7 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes)
        board->fblock = rp;
 
        /* Dump the format block for debugging purposes */
-       if (console_loglevel >= 10) {
+       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) {
                int i;
                printk(KERN_DEBUG "Slot %X, format block at 0x%p\n",
                       slot, rp);