1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 76bbb1e74c29..8019288bc6de 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -6,6 +6,10 @@
  *    Author(s): Arnd Bergmann (arndb@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  */
+
+#define KMSG_COMPONENT "cio"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -128,8 +132,8 @@ css_free_subchannel(struct subchannel *sch)
 {
         if (sch) {
                 /* Reset intparm to zeroes. */
-                sch->schib.pmcw.intparm = 0;
-                cio_modify(sch);
+                sch->config.intparm = 0;
+                cio_commit_config(sch);
                 kfree(sch->lock);
                 kfree(sch);
         }
@@ -844,8 +848,8 @@ out:
         s390_unregister_crw_handler(CRW_RSC_CSS);
         chsc_free_sei_area();
         kfree(slow_subchannel_set);
-        printk(KERN_WARNING"cio: failed to initialize css driver (%d)!\n",
-               ret);
+        pr_alert("The CSS device driver initialization failed with "
+                 "errno=%d\n", ret);
         return ret;
 }