4 files changed, 11 insertions, 26 deletions

diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index d58dc9f15b7..db00b059173 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -123,11 +123,8 @@ static int s390_vary_chpid(struct chp_id chpid, int on)
         CIO_TRACE_EVENT(2, dbf_text);
 
         status = chp_get_status(chpid);
-        if (!on && !status) {
-                printk(KERN_ERR "cio: chpid %x.%02x is already offline\n",
-                       chpid.cssid, chpid.id);
-                return -EINVAL;
-        }
+        if (!on && !status)
+                return 0;
 
         set_chp_logically_online(chpid, on);
         chsc_chp_vary(chpid, on);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 6ebf1b50736..33bff8fec7d 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -74,7 +74,6 @@ out_unregister:
                 debug_unregister(cio_debug_trace_id);
         if (cio_debug_crw_id)
                 debug_unregister(cio_debug_crw_id);
-        printk(KERN_WARNING"cio: could not initialize debugging\n");
         return -1;
 }
 
@@ -755,7 +754,6 @@ cio_get_console_sch_no(void)
                 /* unlike in 2.4, we cannot autoprobe here, since
                  * the channel subsystem is not fully initialized.
                  * With some luck, the HWC console can take over */
-                printk(KERN_WARNING "cio: No ccw console found!\n");
                 return -1;
         }
         return console_irq;
@@ -772,6 +770,7 @@ cio_probe_console(void)
         sch_no = cio_get_console_sch_no();
         if (sch_no == -1) {
                 console_subchannel_in_use = 0;
+                printk(KERN_WARNING "cio: No ccw console found!\n");
                 return ERR_PTR(-ENODEV);
         }
         memset(&console_subchannel, 0, sizeof(struct subchannel));
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 77523131a05..a90b28c0be5 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -612,9 +612,6 @@ static int alloc_cmb(struct ccw_device *cdev)
                         free_pages((unsigned long)mem, get_order(size));
                 } else if (!mem) {
                         /* no luck */
-                        printk(KERN_WARNING "cio: failed to allocate area "
-                               "for measuring %d subchannels\n",
-                               cmb_area.num_channels);
                         ret = -ENOMEM;
                         goto out;
                 } else {
@@ -1230,13 +1227,9 @@ static ssize_t cmb_enable_store(struct device *dev,
         switch (val) {
         case 0:
                 ret = disable_cmf(cdev);
-                if (ret)
-                        dev_info(&cdev->dev, "disable_cmf failed (%d)\n", ret);
                 break;
         case 1:
                 ret = enable_cmf(cdev);
-                if (ret && ret != -EBUSY)
-                        dev_info(&cdev->dev, "enable_cmf failed (%d)\n", ret);
                 break;
         }
 
@@ -1364,8 +1357,6 @@ static int __init init_cmf(void)
                 cmbops = &cmbops_extended;
                 break;
         default:
-                printk(KERN_ERR "cio: Invalid format %d for channel "
-                        "measurement facility\n", format);
                 return 1;
         }
 
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index c904cb84d75..e818d0c54c0 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -493,25 +493,22 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
                 ccw_device_set_online(cdev);
         return 0;
 }
-static void online_store_handle_online(struct ccw_device *cdev, int force)
+static int online_store_handle_online(struct ccw_device *cdev, int force)
 {
         int ret;
 
         ret = online_store_recog_and_online(cdev);
         if (ret)
-                return;
+                return ret;
         if (force && cdev->private->state == DEV_STATE_BOXED) {
                 ret = ccw_device_stlck(cdev);
-                if (ret) {
-                        dev_warn(&cdev->dev,
-                                 "ccw_device_stlck returned %d!\n", ret);
-                        return;
-                }
+                if (ret)
+                        return ret;
                 if (cdev->id.cu_type == 0)
                         cdev->private->state = DEV_STATE_NOT_OPER;
                 online_store_recog_and_online(cdev);
         }
-
+        return 0;
 }
 
 static ssize_t online_store (struct device *dev, struct device_attribute *attr,
@@ -544,8 +541,9 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
                 ret = count;
                 break;
         case 1:
-                online_store_handle_online(cdev, force);
-                ret = count;
+                ret = online_store_handle_online(cdev, force);
+                if (!ret)
+                        ret = count;
                 break;
         default:
                 ret = -EINVAL;