diff options
Diffstat (limited to 'drivers/block/aoe/aoechr.c')
-rw-r--r-- | drivers/block/aoe/aoechr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c index f5cab69fbc91..e22b4c9520a9 100644 --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c | |||
@@ -55,7 +55,8 @@ static int | |||
55 | interfaces(const char __user *str, size_t size) | 55 | interfaces(const char __user *str, size_t size) |
56 | { | 56 | { |
57 | if (set_aoe_iflist(str, size)) { | 57 | if (set_aoe_iflist(str, size)) { |
58 | eprintk("could not set interface list: too many interfaces\n"); | 58 | printk(KERN_ERR |
59 | "aoe: could not set interface list: too many interfaces\n"); | ||
59 | return -EINVAL; | 60 | return -EINVAL; |
60 | } | 61 | } |
61 | return 0; | 62 | return 0; |
@@ -78,7 +79,7 @@ revalidate(const char __user *str, size_t size) | |||
78 | /* should be e%d.%d format */ | 79 | /* should be e%d.%d format */ |
79 | n = sscanf(buf, "e%d.%d", &major, &minor); | 80 | n = sscanf(buf, "e%d.%d", &major, &minor); |
80 | if (n != 2) { | 81 | if (n != 2) { |
81 | eprintk("invalid device specification\n"); | 82 | printk(KERN_ERR "aoe: invalid device specification\n"); |
82 | return -EINVAL; | 83 | return -EINVAL; |
83 | } | 84 | } |
84 | d = aoedev_by_aoeaddr(major, minor); | 85 | d = aoedev_by_aoeaddr(major, minor); |
@@ -113,7 +114,7 @@ bail: spin_unlock_irqrestore(&emsgs_lock, flags); | |||
113 | 114 | ||
114 | mp = kmalloc(n, GFP_ATOMIC); | 115 | mp = kmalloc(n, GFP_ATOMIC); |
115 | if (mp == NULL) { | 116 | if (mp == NULL) { |
116 | eprintk("allocation failure, len=%ld\n", n); | 117 | printk(KERN_ERR "aoe: allocation failure, len=%ld\n", n); |
117 | goto bail; | 118 | goto bail; |
118 | } | 119 | } |
119 | 120 | ||
@@ -138,7 +139,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp | |||
138 | 139 | ||
139 | switch ((unsigned long) filp->private_data) { | 140 | switch ((unsigned long) filp->private_data) { |
140 | default: | 141 | default: |
141 | iprintk("can't write to that file.\n"); | 142 | printk(KERN_INFO "aoe: can't write to that file.\n"); |
142 | break; | 143 | break; |
143 | case MINOR_DISCOVER: | 144 | case MINOR_DISCOVER: |
144 | ret = discover(); | 145 | ret = discover(); |
@@ -247,7 +248,7 @@ aoechr_init(void) | |||
247 | 248 | ||
248 | n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops); | 249 | n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops); |
249 | if (n < 0) { | 250 | if (n < 0) { |
250 | eprintk("can't register char device\n"); | 251 | printk(KERN_ERR "aoe: can't register char device\n"); |
251 | return n; | 252 | return n; |
252 | } | 253 | } |
253 | sema_init(&emsgs_sema, 0); | 254 | sema_init(&emsgs_sema, 0); |