1 files changed, 3 insertions, 16 deletions

diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index b57d93d986c0..920dd71e6434 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -121,14 +121,8 @@ static int s390_vary_chpid(struct chp_id chpid, int on)
         CIO_TRACE_EVENT( 2, dbf_text);
 
         status = chp_get_status(chpid);
-        if (status < 0) {
-                printk(KERN_ERR "Can't vary unknown chpid %x.%02x\n",
-                       chpid.cssid, chpid.id);
-                return -EINVAL;
-        }
-
         if (!on && !status) {
-                printk(KERN_ERR "chpid %x.%02x is already offline\n",
+                printk(KERN_ERR "cio: chpid %x.%02x is already offline\n",
                        chpid.cssid, chpid.id);
                 return -EINVAL;
         }
@@ -421,21 +415,14 @@ int chp_new(struct chp_id chpid)
                 if (ret)
                         goto out_free;
         } else {
-                static int msg_done;
-
-                if (!msg_done) {
-                        printk(KERN_WARNING "cio: Channel measurements not "
-                               "available, continuing.\n");
-                        msg_done = 1;
-                }
                 chp->cmg = -1;
         }
 
         /* make it known to the system */
         ret = device_register(&chp->dev);
         if (ret) {
-                printk(KERN_WARNING "%s: could not register %x.%02x\n",
-                       __func__, chpid.cssid, chpid.id);
+                CIO_MSG_EVENT(0, "Could not register chp%x.%02x: %d\n",
+                              chpid.cssid, chpid.id, ret);
                 goto out_free;
         }
         ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);