1 files changed, 34 insertions, 49 deletions

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 14e420168764..1fa6628d150b 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -31,6 +31,8 @@
  * the OS/400 partition.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/major.h>
 #include <linux/blkdev.h>
 #include <linux/cdrom.h>
@@ -53,9 +55,6 @@
 
 #define VIOCD_VERS "1.06"
 
-#define VIOCD_KERN_WARNING              KERN_WARNING "viocd: "
-#define VIOCD_KERN_INFO                 KERN_INFO "viocd: "
-
 /*
  * Should probably make this a module parameter....sigh
  */
@@ -202,9 +201,8 @@ static int viocd_open(struct cdrom_device_info *cdi, int purpose)
                         (u64)&we, VIOVERSION << 16, ((u64)device_no << 48),
                         0, 0, 0);
         if (hvrc != 0) {
-                printk(VIOCD_KERN_WARNING
-                                "bad rc on HvCallEvent_signalLpEventFast %d\n",
-                                (int)hvrc);
+                pr_warning("bad rc on HvCallEvent_signalLpEventFast %d\n",
+                           (int)hvrc);
                 return -EIO;
         }
 
@@ -213,8 +211,8 @@ static int viocd_open(struct cdrom_device_info *cdi, int purpose)
         if (we.rc) {
                 const struct vio_error_entry *err =
                         vio_lookup_rc(viocd_err_table, we.sub_result);
-                printk(VIOCD_KERN_WARNING "bad rc %d:0x%04X on open: %s\n",
-                                we.rc, we.sub_result, err->msg);
+                pr_warning("bad rc %d:0x%04X on open: %s\n",
+                           we.rc, we.sub_result, err->msg);
                 return -err->errno;
         }
 
@@ -234,9 +232,8 @@ static void viocd_release(struct cdrom_device_info *cdi)
                         viopath_targetinst(viopath_hostLp), 0,
                         VIOVERSION << 16, ((u64)device_no << 48), 0, 0, 0);
         if (hvrc != 0)
-                printk(VIOCD_KERN_WARNING
-                                "bad rc on HvCallEvent_signalLpEventFast %d\n",
-                                (int)hvrc);
+                pr_warning("bad rc on HvCallEvent_signalLpEventFast %d\n",
+                           (int)hvrc);
 }
 
 /* Send a read or write request to OS/400 */
@@ -262,13 +259,12 @@ static int send_request(struct request *req)
 
         sg_init_table(&sg, 1);
         if (blk_rq_map_sg(req->q, req, &sg) == 0) {
-                printk(VIOCD_KERN_WARNING
-                                "error setting up scatter/gather list\n");
+                pr_warning("error setting up scatter/gather list\n");
                 return -1;
         }
 
         if (dma_map_sg(diskinfo->dev, &sg, 1, direction) == 0) {
-                printk(VIOCD_KERN_WARNING "error allocating sg tce\n");
+                pr_warning("error allocating sg tce\n");
                 return -1;
         }
         dmaaddr = sg_dma_address(&sg);
@@ -284,7 +280,7 @@ static int send_request(struct request *req)
                         ((u64)DEVICE_NR(diskinfo) << 48) | dmaaddr,
                         (u64)blk_rq_pos(req) * 512, len, 0);
         if (hvrc != HvLpEvent_Rc_Good) {
-                printk(VIOCD_KERN_WARNING "hv error on op %d\n", (int)hvrc);
+                pr_warning("hv error on op %d\n", (int)hvrc);
                 return -1;
         }
 
@@ -301,8 +297,7 @@ static void do_viocd_request(struct request_queue *q)
                 if (req->cmd_type != REQ_TYPE_FS)
                         __blk_end_request_all(req, -EIO);
                 else if (send_request(req) < 0) {
-                        printk(VIOCD_KERN_WARNING
-                                        "unable to send message to OS/400!");
+                        pr_warning("unable to send message to OS/400!\n");
                         __blk_end_request_all(req, -EIO);
                 } else
                         rwreq++;
@@ -327,8 +322,8 @@ static int viocd_media_changed(struct cdrom_device_info *cdi, int disc_nr)
                         (u64)&we, VIOVERSION << 16, ((u64)device_no << 48),
                         0, 0, 0);
         if (hvrc != 0) {
-                printk(VIOCD_KERN_WARNING "bad rc on HvCallEvent_signalLpEventFast %d\n",
-                                (int)hvrc);
+                pr_warning("bad rc on HvCallEvent_signalLpEventFast %d\n",
+                           (int)hvrc);
                 return -EIO;
         }
 
@@ -338,9 +333,8 @@ static int viocd_media_changed(struct cdrom_device_info *cdi, int disc_nr)
         if (we.rc) {
                 const struct vio_error_entry *err =
                         vio_lookup_rc(viocd_err_table, we.sub_result);
-                printk(VIOCD_KERN_WARNING
-                                "bad rc %d:0x%04X on check_change: %s; Assuming no change\n",
-                                we.rc, we.sub_result, err->msg);
+                pr_warning("bad rc %d:0x%04X on check_change: %s; Assuming no change\n",
+                           we.rc, we.sub_result, err->msg);
                 return 0;
         }
 
@@ -367,8 +361,8 @@ static int viocd_lock_door(struct cdrom_device_info *cdi, int locking)
                         (u64)&we, VIOVERSION << 16,
                         (device_no << 48) | (flags << 32), 0, 0, 0);
         if (hvrc != 0) {
-                printk(VIOCD_KERN_WARNING "bad rc on HvCallEvent_signalLpEventFast %d\n",
-                                (int)hvrc);
+                pr_warning("bad rc on HvCallEvent_signalLpEventFast %d\n",
+                           (int)hvrc);
                 return -EIO;
         }
 
@@ -455,8 +449,7 @@ static void vio_handle_cd_event(struct HvLpEvent *event)
                 return;
         /* First, we should NEVER get an int here...only acks */
         if (hvlpevent_is_int(event)) {
-                printk(VIOCD_KERN_WARNING
-                                "Yikes! got an int in viocd event handler!\n");
+                pr_warning("Yikes! got an int in viocd event handler!\n");
                 if (hvlpevent_need_ack(event)) {
                         event->xRc = HvLpEvent_Rc_InvalidSubtype;
                         HvCallEvent_ackLpEvent(event);
@@ -510,10 +503,9 @@ return_complete:
                         const struct vio_error_entry *err =
                                 vio_lookup_rc(viocd_err_table,
                                                 bevent->sub_result);
-                        printk(VIOCD_KERN_WARNING "request %p failed "
-                                        "with rc %d:0x%04X: %s\n",
-                                        req, event->xRc,
-                                        bevent->sub_result, err->msg);
+                        pr_warning("request %p failed with rc %d:0x%04X: %s\n",
+                                   req, event->xRc,
+                                   bevent->sub_result, err->msg);
                         __blk_end_request_all(req, -EIO);
                 } else
                         __blk_end_request_all(req, 0);
@@ -524,9 +516,8 @@ return_complete:
                 break;
 
         default:
-                printk(VIOCD_KERN_WARNING
-                                "message with invalid subtype %0x04X!\n",
-                                event->xSubtype & VIOMINOR_SUBTYPE_MASK);
+                pr_warning("message with invalid subtype %0x04X!\n",
+                           event->xSubtype & VIOMINOR_SUBTYPE_MASK);
                 if (hvlpevent_need_ack(event)) {
                         event->xRc = HvLpEvent_Rc_InvalidSubtype;
                         HvCallEvent_ackLpEvent(event);
@@ -593,23 +584,19 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         sprintf(c->name, VIOCD_DEVICE "%c", 'a' + deviceno);
 
         if (register_cdrom(c) != 0) {
-                printk(VIOCD_KERN_WARNING "Cannot register viocd CD-ROM %s!\n",
-                                c->name);
+                pr_warning("Cannot register viocd CD-ROM %s!\n", c->name);
                 goto out;
         }
-        printk(VIOCD_KERN_INFO "cd %s is iSeries resource %10.10s "
-                        "type %4.4s, model %3.3s\n",
-                        c->name, d->rsrcname, d->type, d->model);
+        pr_info("cd %s is iSeries resource %10.10s type %4.4s, model %3.3s\n",
+                c->name, d->rsrcname, d->type, d->model);
         q = blk_init_queue(do_viocd_request, &viocd_reqlock);
         if (q == NULL) {
-                printk(VIOCD_KERN_WARNING "Cannot allocate queue for %s!\n",
-                                c->name);
+                pr_warning("Cannot allocate queue for %s!\n", c->name);
                 goto out_unregister_cdrom;
         }
         gendisk = alloc_disk(1);
         if (gendisk == NULL) {
-                printk(VIOCD_KERN_WARNING "Cannot create gendisk for %s!\n",
-                                c->name);
+                pr_warning("Cannot create gendisk for %s!\n", c->name);
                 goto out_cleanup_queue;
         }
         gendisk->major = VIOCD_MAJOR;
@@ -682,21 +669,19 @@ static int __init viocd_init(void)
                         return -ENODEV;
         }
 
-        printk(VIOCD_KERN_INFO "vers " VIOCD_VERS ", hosting partition %d\n",
-                        viopath_hostLp);
+        pr_info("vers " VIOCD_VERS ", hosting partition %d\n", viopath_hostLp);
 
         if (register_blkdev(VIOCD_MAJOR, VIOCD_DEVICE) != 0) {
-                printk(VIOCD_KERN_WARNING "Unable to get major %d for %s\n",
-                                VIOCD_MAJOR, VIOCD_DEVICE);
+                pr_warning("Unable to get major %d for %s\n",
+                           VIOCD_MAJOR, VIOCD_DEVICE);
                 return -EIO;
         }
 
         ret = viopath_open(viopath_hostLp, viomajorsubtype_cdio,
                         MAX_CD_REQ + 2);
         if (ret) {
-                printk(VIOCD_KERN_WARNING
-                                "error opening path to host partition %d\n",
-                                viopath_hostLp);
+                pr_warning("error opening path to host partition %d\n",
+                           viopath_hostLp);
                 goto out_unregister;
         }