diff options
Diffstat (limited to 'arch/x86/kernel/mmiotrace/testmmiotrace.c')
-rw-r--r-- | arch/x86/kernel/mmiotrace/testmmiotrace.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/x86/kernel/mmiotrace/testmmiotrace.c b/arch/x86/kernel/mmiotrace/testmmiotrace.c index 40e66b0e6480..5ecff578672b 100644 --- a/arch/x86/kernel/mmiotrace/testmmiotrace.c +++ b/arch/x86/kernel/mmiotrace/testmmiotrace.c | |||
@@ -41,8 +41,7 @@ static void do_test(void) | |||
41 | { | 41 | { |
42 | void __iomem *p = ioremap_nocache_trace(mmio_address, 0x4000); | 42 | void __iomem *p = ioremap_nocache_trace(mmio_address, 0x4000); |
43 | if (!p) { | 43 | if (!p) { |
44 | printk(KERN_ERR MODULE_NAME ": could not ioremap IO memory, " | 44 | pr_err(MODULE_NAME ": could not ioremap, aborting.\n"); |
45 | "aborting.\n"); | ||
46 | return; | 45 | return; |
47 | } | 46 | } |
48 | do_write_test(p); | 47 | do_write_test(p); |
@@ -53,14 +52,14 @@ static void do_test(void) | |||
53 | static int __init init(void) | 52 | static int __init init(void) |
54 | { | 53 | { |
55 | if (mmio_address == 0) { | 54 | if (mmio_address == 0) { |
56 | printk(KERN_ERR MODULE_NAME ": you have to use the module " | 55 | pr_err(MODULE_NAME ": you have to use the module argument " |
57 | "argument mmio_address.\n"); | 56 | "mmio_address.\n"); |
58 | printk(KERN_ERR MODULE_NAME ": DO NOT LOAD THIS MODULE UNLESS" | 57 | pr_err(MODULE_NAME ": DO NOT LOAD THIS MODULE UNLESS" |
59 | " YOU REALLY KNOW WHAT YOU ARE DOING!\n"); | 58 | " YOU REALLY KNOW WHAT YOU ARE DOING!\n"); |
60 | return -ENXIO; | 59 | return -ENXIO; |
61 | } | 60 | } |
62 | 61 | ||
63 | printk(KERN_WARNING MODULE_NAME ": WARNING: mapping 16 kB @ 0x%08lx " | 62 | pr_warning(MODULE_NAME ": WARNING: mapping 16 kB @ 0x%08lx " |
64 | "in PCI address space, and writing " | 63 | "in PCI address space, and writing " |
65 | "rubbish in there.\n", mmio_address); | 64 | "rubbish in there.\n", mmio_address); |
66 | do_test(); | 65 | do_test(); |
@@ -69,7 +68,7 @@ static int __init init(void) | |||
69 | 68 | ||
70 | static void __exit cleanup(void) | 69 | static void __exit cleanup(void) |
71 | { | 70 | { |
72 | printk(KERN_DEBUG MODULE_NAME ": unloaded.\n"); | 71 | pr_debug(MODULE_NAME ": unloaded.\n"); |
73 | } | 72 | } |
74 | 73 | ||
75 | module_init(init); | 74 | module_init(init); |