aoe: clean up printks via macros

Use simple macros to clean up the printks.
(This patch is reverted by the 14th patch to follow.)

Signed-off-by: "Ed L. Cashin" <ecashin@coraid.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index fa0e8cae6100..a7dbe6f53c14 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -132,8 +132,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
         d = bio->bi_bdev->bd_disk->private_data;
         buf = mempool_alloc(d->bufpool, GFP_NOIO);
         if (buf == NULL) {
-                printk(KERN_INFO "aoe: aoeblk_make_request: buf allocation "
-                        "failure\n");
+                iprintk("buf allocation failure\n");
                 bio_endio(bio, bio->bi_size, -ENOMEM);
                 return 0;
         }
@@ -150,8 +149,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
         spin_lock_irqsave(&d->lock, flags);
 
         if ((d->flags & DEVFL_UP) == 0) {
-                printk(KERN_INFO "aoe: aoeblk_make_request: device %ld.%ld is not up\n",
-                        d->aoemajor, d->aoeminor);
+                iprintk("device %ld.%ld is not up\n", d->aoemajor, d->aoeminor);
                 spin_unlock_irqrestore(&d->lock, flags);
                 mempool_free(buf, d->bufpool);
                 bio_endio(bio, bio->bi_size, -ENXIO);
@@ -176,7 +174,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         struct aoedev *d = bdev->bd_disk->private_data;
 
         if ((d->flags & DEVFL_UP) == 0) {
-                printk(KERN_ERR "aoe: aoeblk_ioctl: disk not up\n");
+                eprintk("disk not up\n");
                 return -ENODEV;
         }
 
@@ -203,8 +201,8 @@ aoeblk_gdalloc(void *vp)
 
         gd = alloc_disk(AOE_PARTITIONS);
         if (gd == NULL) {
-                printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate disk "
-                        "structure for %ld.%ld\n", d->aoemajor, d->aoeminor);
+                eprintk("cannot allocate disk structure for %ld.%ld\n",
+                        d->aoemajor, d->aoeminor);
                 spin_lock_irqsave(&d->lock, flags);
                 d->flags &= ~DEVFL_GDALLOC;
                 spin_unlock_irqrestore(&d->lock, flags);
@@ -213,8 +211,8 @@ aoeblk_gdalloc(void *vp)
 
         d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
         if (d->bufpool == NULL) {
-                printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool "
-                        "for %ld.%ld\n", d->aoemajor, d->aoeminor);
+                eprintk("cannot allocate bufpool for %ld.%ld\n",
+                        d->aoemajor, d->aoeminor);
                 put_disk(gd);
                 spin_lock_irqsave(&d->lock, flags);
                 d->flags &= ~DEVFL_GDALLOC;