Commit 7d1f5e70 authored by Andrew Morton's avatar Andrew Morton Committed by James Bottomley

[PATCH] reduce aacraid namespace polution

From: Jens Axboe <axboe@suse.de>

This easily clashes with others (it's been seen, hence the patch), so lets
move aacraid log levels to something a little more private.
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 8ee744ed
...@@ -401,15 +401,15 @@ struct aac_init ...@@ -401,15 +401,15 @@ struct aac_init
}; };
enum aac_log_level { enum aac_log_level {
LOG_INIT = 10, LOG_AAC_INIT = 10,
LOG_INFORMATIONAL = 20, LOG_AAC_INFORMATIONAL = 20,
LOG_WARNING = 30, LOG_AAC_WARNING = 30,
LOG_LOW_ERROR = 40, LOG_AAC_LOW_ERROR = 40,
LOG_MEDIUM_ERROR = 50, LOG_AAC_MEDIUM_ERROR = 50,
LOG_HIGH_ERROR = 60, LOG_AAC_HIGH_ERROR = 60,
LOG_PANIC = 70, LOG_AAC_PANIC = 70,
LOG_DEBUG = 80, LOG_AAC_DEBUG = 80,
LOG_WINDBG_PRINT = 90 LOG_AAC_WINDBG_PRINT = 90
}; };
#define FSAFS_NTC_GET_ADAPTER_FIB_CONTEXT 0x030b #define FSAFS_NTC_GET_ADAPTER_FIB_CONTEXT 0x030b
......
...@@ -761,7 +761,7 @@ void aac_printf(struct aac_dev *dev, u32 val) ...@@ -761,7 +761,7 @@ void aac_printf(struct aac_dev *dev, u32 val)
length = 255; length = 255;
if (cp[length] != 0) if (cp[length] != 0)
cp[length] = 0; cp[length] = 0;
if (level == LOG_HIGH_ERROR) if (level == LOG_AAC_HIGH_ERROR)
printk(KERN_WARNING "aacraid:%s", cp); printk(KERN_WARNING "aacraid:%s", cp);
else else
printk(KERN_INFO "aacraid:%s", cp); printk(KERN_INFO "aacraid:%s", cp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment