[S390] cio: Clean up messages.

- Remove unneeded messages.
- Move some messages into the debug feature.
- Use dev_* where appropriate.
- Use "cio: " prefix consistently.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 38 insertions, 22 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 001682e70f67..297659fa0e26 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -338,15 +338,20 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
                 rc = device_schedule_callback(&cdev->dev,
                                               ccw_device_remove_orphan_cb);
                 if (rc)
-                        dev_info(&cdev->dev, "Couldn't unregister orphan\n");
+                        CIO_MSG_EVENT(2, "Couldn't unregister orphan "
+                                      "0.%x.%04x\n",
+                                      cdev->private->dev_id.ssid,
+                                      cdev->private->dev_id.devno);
                 return;
         }
         /* Deregister subchannel, which will kill the ccw device. */
         rc = device_schedule_callback(cdev->dev.parent,
                                       ccw_device_remove_sch_cb);
         if (rc)
-                dev_info(&cdev->dev,
-                         "Couldn't unregister disconnected device\n");
+                CIO_MSG_EVENT(2, "Couldn't unregister disconnected device "
+                              "0.%x.%04x\n",
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno);
 }
 
 int
@@ -379,8 +384,10 @@ ccw_device_set_offline(struct ccw_device *cdev)
         if (ret == 0)
                 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
         else {
-                pr_debug("ccw_device_offline returned %d, device %s\n",
-                         ret, cdev->dev.bus_id);
+                CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
+                              "device 0.%x.%04x\n",
+                              ret, cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno);
                 cdev->online = 1;
         }
         return ret;
@@ -402,8 +409,10 @@ ccw_device_set_online(struct ccw_device *cdev)
         if (ret == 0)
                 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
         else {
-                pr_debug("ccw_device_online returned %d, device %s\n",
-                         ret, cdev->dev.bus_id);
+                CIO_MSG_EVENT(2, "ccw_device_online returned %d, "
+                              "device 0.%x.%04x\n",
+                              ret, cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno);
                 return ret;
         }
         if (cdev->private->state != DEV_STATE_ONLINE)
@@ -417,9 +426,11 @@ ccw_device_set_online(struct ccw_device *cdev)
         spin_unlock_irq(cdev->ccwlock);
         if (ret == 0)
                 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
-        else 
-                pr_debug("ccw_device_offline returned %d, device %s\n",
-                         ret, cdev->dev.bus_id);
+        else
+                CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
+                              "device 0.%x.%04x\n",
+                              ret, cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno);
         return (ret == 0) ? -ENODEV : ret;
 }
 
@@ -439,9 +450,10 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
         if (cdev->id.cu_type == 0) {
                 ret = ccw_device_recognition(cdev);
                 if (ret) {
-                        printk(KERN_WARNING"Couldn't start recognition "
-                               "for device %s (ret=%d)\n",
-                               cdev->dev.bus_id, ret);
+                        CIO_MSG_EVENT(0, "Couldn't start recognition "
+                                      "for device 0.%x.%04x (ret=%d)\n",
+                                      cdev->private->dev_id.ssid,
+                                      cdev->private->dev_id.devno, ret);
                         return ret;
                 }
                 wait_event(cdev->private->wait_q,
@@ -461,8 +473,8 @@ static void online_store_handle_online(struct ccw_device *cdev, int force)
         if (force && cdev->private->state == DEV_STATE_BOXED) {
                 ret = ccw_device_stlck(cdev);
                 if (ret) {
-                        printk(KERN_WARNING"ccw_device_stlck for device %s "
-                               "returned %d!\n", cdev->dev.bus_id, ret);
+                        dev_warn(&cdev->dev,
+                                 "ccw_device_stlck returned %d!\n", ret);
                         return;
                 }
                 if (cdev->id.cu_type == 0)
@@ -893,8 +905,10 @@ io_subchannel_register(struct work_struct *work)
                         ret = device_reprobe(&cdev->dev);
                         if (ret)
                                 /* We can't do much here. */
-                                dev_info(&cdev->dev, "device_reprobe() returned"
-                                         " %d\n", ret);
+                                CIO_MSG_EVENT(2, "device_reprobe() returned"
+                                              " %d for 0.%x.%04x\n", ret,
+                                              cdev->private->dev_id.ssid,
+                                              cdev->private->dev_id.devno);
                 }
                 goto out;
         }
@@ -907,8 +921,9 @@ io_subchannel_register(struct work_struct *work)
         /* make it known to the system */
         ret = ccw_device_register(cdev);
         if (ret) {
-                printk (KERN_WARNING "%s: could not register %s\n",
-                        __func__, cdev->dev.bus_id);
+                CIO_MSG_EVENT(0, "Could not register ccw dev 0.%x.%04x: %d\n",
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno, ret);
                 put_device(&cdev->dev);
                 spin_lock_irqsave(sch->lock, flags);
                 sch->dev.driver_data = NULL;
@@ -1361,7 +1376,6 @@ ccw_device_remove (struct device *dev)
         struct ccw_driver *cdrv = cdev->drv;
         int ret;
 
-        pr_debug("removing device %s\n", cdev->dev.bus_id);
         if (cdrv->remove)
                 cdrv->remove(cdev);
         if (cdev->online) {
@@ -1374,8 +1388,10 @@ ccw_device_remove (struct device *dev)
                                    dev_fsm_final_state(cdev));
                 else
                         //FIXME: we can't fail!
-                        pr_debug("ccw_device_offline returned %d, device %s\n",
-                                 ret, cdev->dev.bus_id);
+                        CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
+                                      "device 0.%x.%04x\n",
+                                      ret, cdev->private->dev_id.ssid,
+                                      cdev->private->dev_id.devno);
         }
         ccw_device_set_timeout(cdev, 0);
         cdev->drv = NULL;