16 files changed, 108 insertions, 98 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1b6c52ef7339..acb78017e7d0 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2333,13 +2333,11 @@ int dasd_generic_notify(struct ccw_device *cdev, int event)
 {
         struct dasd_device *device;
         struct dasd_ccw_req *cqr;
-        unsigned long flags;
         int ret;
 
-        device = dasd_device_from_cdev(cdev);
+        device = dasd_device_from_cdev_locked(cdev);
         if (IS_ERR(device))
                 return 0;
-        spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
         ret = 0;
         switch (event) {
         case CIO_GONE:
@@ -2369,7 +2367,6 @@ int dasd_generic_notify(struct ccw_device *cdev, int event)
                 ret = 1;
                 break;
         }
-        spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
         dasd_put_device(device);
         return ret;
 }
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index 4bf0aa5112c1..2476f87d21d0 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -308,7 +308,7 @@ struct dasd_psf_prssd_data {
         unsigned char flags;
         unsigned char reserved[4];
         unsigned char suborder;
-        unsigned char varies[9];
+        unsigned char varies[5];
 } __attribute__ ((packed));
 
 /*
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 29da4413ad43..bf512ac75b9e 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -16,6 +16,7 @@
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/smp_lock.h>
+#include <linux/err.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -457,7 +458,7 @@ int dasd_eer_enable(struct dasd_device *device)
 
         cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */,
                                    SNSS_DATA_SIZE, device);
-        if (!cqr)
+        if (IS_ERR(cqr))
                 return -ENOMEM;
 
         cqr->startdev = device;
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 01fcdd91b846..711b3004b3e6 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -384,6 +384,11 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
          * get minor, add to list
          */
         down_write(&dcssblk_devices_sem);
+        if (dcssblk_get_device_by_name(local_buf)) {
+                up_write(&dcssblk_devices_sem);
+                rc = -EEXIST;
+                goto unload_seg;
+        }
         rc = dcssblk_assign_free_minor(dev_info);
         if (rc) {
                 up_write(&dcssblk_devices_sem);
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 687720b552d1..be0ce2215c8d 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -109,7 +109,7 @@ tapechar_check_idalbuffer(struct tape_device *device, size_t block_size)
 
         /* The current idal buffer is not correct. Allocate a new one. */
         new = idal_buffer_alloc(block_size, 0);
-        if (new == NULL)
+        if (IS_ERR(new))
                 return -ENOMEM;
 
         if (device->char_data.idal_buf != NULL)
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 2a1af4e60be0..cc8fd781ee22 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count)
 
         /* Allocate a new idal buffer. */
         new = idal_buffer_alloc(count, 0);
-        if (new == NULL)
+        if (IS_ERR(new))
                 return -ENOMEM;
         if (device->char_data.idal_buf != NULL)
                 idal_buffer_free(device->char_data.idal_buf);
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 26a930e832bd..e0ce65fca4e7 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -112,8 +112,10 @@ ccwgroup_release (struct device *dev)
         gdev = to_ccwgroupdev(dev);
 
         for (i = 0; i < gdev->count; i++) {
-                dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
-                put_device(&gdev->cdev[i]->dev);
+                if (gdev->cdev[i]) {
+                        dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
+                        put_device(&gdev->cdev[i]->dev);
+                }
         }
         kfree(gdev);
 }
@@ -221,6 +223,13 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
         atomic_set(&gdev->onoff, 0);
         mutex_init(&gdev->reg_mutex);
         mutex_lock(&gdev->reg_mutex);
+        gdev->creator_id = creator_id;
+        gdev->count = num_devices;
+        gdev->dev.bus = &ccwgroup_bus_type;
+        gdev->dev.parent = root;
+        gdev->dev.release = ccwgroup_release;
+        device_initialize(&gdev->dev);
+
         curr_buf = buf;
         for (i = 0; i < num_devices && curr_buf; i++) {
                 rc = __get_next_bus_id(&curr_buf, tmp_bus_id);
@@ -258,16 +267,11 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
                 rc = -EINVAL;
                 goto error;
         }
-        gdev->creator_id = creator_id;
-        gdev->count = num_devices;
-        gdev->dev.bus = &ccwgroup_bus_type;
-        gdev->dev.parent = root;
-        gdev->dev.release = ccwgroup_release;
 
         snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s",
                         gdev->cdev[0]->dev.bus_id);
 
-        rc = device_register(&gdev->dev);
+        rc = device_add(&gdev->dev);
         if (rc)
                 goto error;
         get_device(&gdev->dev);
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 46c021d880dc..51489eff6b0b 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -477,7 +477,6 @@ void css_schedule_eval_all(void)
 
 void css_wait_for_slow_path(void)
 {
-        flush_workqueue(ccw_device_notify_work);
         flush_workqueue(slow_path_wq);
 }
 
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index e818d0c54c09..28221030b886 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -150,7 +150,6 @@ static struct css_driver io_subchannel_driver = {
 };
 
 struct workqueue_struct *ccw_device_work;
-struct workqueue_struct *ccw_device_notify_work;
 wait_queue_head_t ccw_device_init_wq;
 atomic_t ccw_device_init_count;
 
@@ -168,11 +167,6 @@ init_ccw_bus_type (void)
         ccw_device_work = create_singlethread_workqueue("cio");
         if (!ccw_device_work)
                 return -ENOMEM; /* FIXME: better errno ? */
-        ccw_device_notify_work = create_singlethread_workqueue("cio_notify");
-        if (!ccw_device_notify_work) {
-                ret = -ENOMEM; /* FIXME: better errno ? */
-                goto out_err;
-        }
         slow_path_wq = create_singlethread_workqueue("kslowcrw");
         if (!slow_path_wq) {
                 ret = -ENOMEM; /* FIXME: better errno ? */
@@ -192,8 +186,6 @@ init_ccw_bus_type (void)
 out_err:
         if (ccw_device_work)
                 destroy_workqueue(ccw_device_work);
-        if (ccw_device_notify_work)
-                destroy_workqueue(ccw_device_notify_work);
         if (slow_path_wq)
                 destroy_workqueue(slow_path_wq);
         return ret;
@@ -204,7 +196,6 @@ cleanup_ccw_bus_type (void)
 {
         css_driver_unregister(&io_subchannel_driver);
         bus_unregister(&ccw_bus_type);
-        destroy_workqueue(ccw_device_notify_work);
         destroy_workqueue(ccw_device_work);
 }
 
@@ -1496,11 +1487,22 @@ static void device_set_disconnected(struct ccw_device *cdev)
                 ccw_device_schedule_recovery();
 }
 
+void ccw_device_set_notoper(struct ccw_device *cdev)
+{
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+
+        CIO_TRACE_EVENT(2, "notoper");
+        CIO_TRACE_EVENT(2, sch->dev.bus_id);
+        ccw_device_set_timeout(cdev, 0);
+        cio_disable_subchannel(sch);
+        cdev->private->state = DEV_STATE_NOT_OPER;
+}
+
 static int io_subchannel_sch_event(struct subchannel *sch, int slow)
 {
         int event, ret, disc;
         unsigned long flags;
-        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE } action;
+        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE, DISC } action;
         struct ccw_device *cdev;
 
         spin_lock_irqsave(sch->lock, flags);
@@ -1535,16 +1537,11 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
                 }
                 /* fall through */
         case CIO_GONE:
-                /* Prevent unwanted effects when opening lock. */
-                cio_disable_subchannel(sch);
-                device_set_disconnected(cdev);
                 /* Ask driver what to do with device. */
-                action = UNREGISTER;
-                spin_unlock_irqrestore(sch->lock, flags);
-                ret = io_subchannel_notify(sch, event);
-                spin_lock_irqsave(sch->lock, flags);
-                if (ret)
-                        action = NONE;
+                if (io_subchannel_notify(sch, event))
+                        action = DISC;
+                else
+                        action = UNREGISTER;
                 break;
         case CIO_REVALIDATE:
                 /* Device will be removed, so no notify necessary. */
@@ -1565,6 +1562,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
         switch (action) {
         case UNREGISTER:
         case UNREGISTER_PROBE:
+                ccw_device_set_notoper(cdev);
                 /* Unregister device (will use subchannel lock). */
                 spin_unlock_irqrestore(sch->lock, flags);
                 css_sch_device_unregister(sch);
@@ -1577,6 +1575,9 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
         case REPROBE:
                 ccw_device_trigger_reprobe(cdev);
                 break;
+        case DISC:
+                device_set_disconnected(cdev);
+                break;
         default:
                 break;
         }
@@ -1828,5 +1829,4 @@ EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);
 EXPORT_SYMBOL(ccw_bus_type);
 EXPORT_SYMBOL(ccw_device_work);
-EXPORT_SYMBOL(ccw_device_notify_work);
 EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 9800a8335a3f..6f5c3f2b3587 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -72,7 +72,6 @@ dev_fsm_final_state(struct ccw_device *cdev)
 }
 
 extern struct workqueue_struct *ccw_device_work;
-extern struct workqueue_struct *ccw_device_notify_work;
 extern wait_queue_head_t ccw_device_init_wq;
 extern atomic_t ccw_device_init_count;
 
@@ -120,6 +119,7 @@ int ccw_device_stlck(struct ccw_device *);
 void ccw_device_trigger_reprobe(struct ccw_device *);
 void ccw_device_kill_io(struct ccw_device *);
 int ccw_device_notify(struct ccw_device *, int);
+void ccw_device_set_notoper(struct ccw_device *cdev);
 
 /* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 8b5fe57fb2f3..550508df952b 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -337,26 +337,34 @@ int ccw_device_notify(struct ccw_device *cdev, int event)
                 return 0;
         if (!cdev->online)
                 return 0;
+        CIO_MSG_EVENT(2, "notify called for 0.%x.%04x, event=%d\n",
+                      cdev->private->dev_id.ssid, cdev->private->dev_id.devno,
+                      event);
         return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
 }
 
-static void
-ccw_device_oper_notify(struct work_struct *work)
+static void cmf_reenable_delayed(struct work_struct *work)
 {
         struct ccw_device_private *priv;
         struct ccw_device *cdev;
-        int ret;
 
         priv = container_of(work, struct ccw_device_private, kick_work);
         cdev = priv->cdev;
-        ret = ccw_device_notify(cdev, CIO_OPER);
-        if (ret) {
+        cmf_reenable(cdev);
+}
+
+static void ccw_device_oper_notify(struct ccw_device *cdev)
+{
+        if (ccw_device_notify(cdev, CIO_OPER)) {
                 /* Reenable channel measurements, if needed. */
-                cmf_reenable(cdev);
-                wake_up(&cdev->private->wait_q);
-        } else
-                /* Driver doesn't want device back. */
-                ccw_device_do_unreg_rereg(work);
+                PREPARE_WORK(&cdev->private->kick_work, cmf_reenable_delayed);
+                queue_work(ccw_device_work, &cdev->private->kick_work);
+                return;
+        }
+        /* Driver doesn't want device back. */
+        ccw_device_set_notoper(cdev);
+        PREPARE_WORK(&cdev->private->kick_work, ccw_device_do_unreg_rereg);
+        queue_work(ccw_device_work, &cdev->private->kick_work);
 }
 
 /*
@@ -386,8 +394,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
 
         if (cdev->private->flags.donotify) {
                 cdev->private->flags.donotify = 0;
-                PREPARE_WORK(&cdev->private->kick_work, ccw_device_oper_notify);
-                queue_work(ccw_device_notify_work, &cdev->private->kick_work);
+                ccw_device_oper_notify(cdev);
         }
         wake_up(&cdev->private->wait_q);
 
diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h
index 8484b83698e1..5a4d85b829ad 100644
--- a/drivers/s390/cio/qdio_debug.h
+++ b/drivers/s390/cio/qdio_debug.h
@@ -61,18 +61,18 @@
 
 /* s390dbf views */
 #define QDIO_DBF_SETUP_LEN              8
-#define QDIO_DBF_SETUP_PAGES            4
+#define QDIO_DBF_SETUP_PAGES            8
 #define QDIO_DBF_SETUP_NR_AREAS         1
 
 #define QDIO_DBF_TRACE_LEN              8
 #define QDIO_DBF_TRACE_NR_AREAS         2
 
 #ifdef CONFIG_QDIO_DEBUG
-#define QDIO_DBF_TRACE_PAGES            16
+#define QDIO_DBF_TRACE_PAGES            32
 #define QDIO_DBF_SETUP_LEVEL            6
 #define QDIO_DBF_TRACE_LEVEL            4
 #else /* !CONFIG_QDIO_DEBUG */
-#define QDIO_DBF_TRACE_PAGES            4
+#define QDIO_DBF_TRACE_PAGES            8
 #define QDIO_DBF_SETUP_LEVEL            2
 #define QDIO_DBF_TRACE_LEVEL            2
 #endif /* CONFIG_QDIO_DEBUG */
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index d15648514a0f..e6eabc853422 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -330,6 +330,7 @@ static int qdio_siga_output(struct qdio_q *q)
         int cc;
         u32 busy_bit;
         u64 start_time = 0;
+        char dbf_text[15];
 
         QDIO_DBF_TEXT5(0, trace, "sigaout");
         QDIO_DBF_HEX5(0, trace, &q, sizeof(void *));
@@ -338,6 +339,9 @@ static int qdio_siga_output(struct qdio_q *q)
 again:
         cc = qdio_do_siga_output(q, &busy_bit);
         if (queue_type(q) == QDIO_IQDIO_QFMT && cc == 2 && busy_bit) {
+                sprintf(dbf_text, "bb%4x%2x", q->irq_ptr->schid.sch_no, q->nr);
+                QDIO_DBF_TEXT3(0, trace, dbf_text);
+
                 if (!start_time)
                         start_time = get_usecs();
                 else if ((get_usecs() - start_time) < QDIO_BUSY_BIT_PATIENCE)
@@ -748,16 +752,18 @@ static void qdio_kick_outbound_q(struct qdio_q *q)
         rc = qdio_siga_output(q);
         switch (rc) {
         case 0:
-                /* went smooth this time, reset timestamp */
-                q->u.out.timestamp = 0;
-
                 /* TODO: improve error handling for CC=0 case */
 #ifdef CONFIG_QDIO_DEBUG
-                QDIO_DBF_TEXT3(0, trace, "cc2reslv");
-                sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no, q->nr,
-                        atomic_read(&q->u.out.busy_siga_counter));
-                QDIO_DBF_TEXT3(0, trace, dbf_text);
+                if (q->u.out.timestamp) {
+                        QDIO_DBF_TEXT3(0, trace, "cc2reslv");
+                        sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no,
+                                q->nr,
+                                atomic_read(&q->u.out.busy_siga_counter));
+                        QDIO_DBF_TEXT3(0, trace, dbf_text);
+                }
 #endif /* CONFIG_QDIO_DEBUG */
+                /* went smooth this time, reset timestamp */
+                q->u.out.timestamp = 0;
                 break;
         /* cc=2 and busy bit */
         case (2 | QDIO_ERROR_SIGA_BUSY):
@@ -1066,14 +1072,12 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
         if (IS_ERR(irb)) {
                 switch (PTR_ERR(irb)) {
                 case -EIO:
-                        sprintf(dbf_text, "ierr%4x",
-                                cdev->private->schid.sch_no);
+                        sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
                         QDIO_DBF_TEXT2(1, setup, dbf_text);
                         qdio_int_error(cdev);
                         return;
                 case -ETIMEDOUT:
-                        sprintf(dbf_text, "qtoh%4x",
-                                cdev->private->schid.sch_no);
+                        sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);
                         QDIO_DBF_TEXT2(1, setup, dbf_text);
                         qdio_int_error(cdev);
                         return;
@@ -1124,8 +1128,10 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
 struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev)
 {
         struct qdio_irq *irq_ptr;
+        char dbf_text[15];
 
-        QDIO_DBF_TEXT0(0, setup, "getssqd");
+        sprintf(dbf_text, "qssq%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
 
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
@@ -1149,14 +1155,13 @@ int qdio_cleanup(struct ccw_device *cdev, int how)
         char dbf_text[15];
         int rc;
 
+        sprintf(dbf_text, "qcln%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
 
-        sprintf(dbf_text, "qcln%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-
         rc = qdio_shutdown(cdev, how);
         if (rc == 0)
                 rc = qdio_free(cdev);
@@ -1191,6 +1196,9 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
         unsigned long flags;
         char dbf_text[15];
 
+        sprintf(dbf_text, "qshu%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
@@ -1205,10 +1213,6 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
                 return 0;
         }
 
-        sprintf(dbf_text, "qsqs%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-
         tiqdio_remove_input_queues(irq_ptr);
         qdio_shutdown_queues(cdev);
         qdio_shutdown_debug_entries(irq_ptr, cdev);
@@ -1247,7 +1251,6 @@ no_cleanup:
 
         qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE);
         mutex_unlock(&irq_ptr->setup_mutex);
-        module_put(THIS_MODULE);
         if (rc)
                 return rc;
         return 0;
@@ -1263,16 +1266,14 @@ int qdio_free(struct ccw_device *cdev)
         struct qdio_irq *irq_ptr;
         char dbf_text[15];
 
+        sprintf(dbf_text, "qfre%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
 
         mutex_lock(&irq_ptr->setup_mutex);
-
-        sprintf(dbf_text, "qfqs%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-
         cdev->private->qdio_data = NULL;
         mutex_unlock(&irq_ptr->setup_mutex);
 
@@ -1295,7 +1296,6 @@ int qdio_initialize(struct qdio_initialize *init_data)
 
         sprintf(dbf_text, "qini%4x", init_data->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
 
         rc = qdio_allocate(init_data);
         if (rc)
@@ -1319,7 +1319,6 @@ int qdio_allocate(struct qdio_initialize *init_data)
 
         sprintf(dbf_text, "qalc%4x", init_data->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
 
         if ((init_data->no_input_qs && !init_data->input_handler) ||
             (init_data->no_output_qs && !init_data->output_handler))
@@ -1389,6 +1388,9 @@ int qdio_establish(struct qdio_initialize *init_data)
         unsigned long saveflags;
         int rc;
 
+        sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
@@ -1396,13 +1398,6 @@ int qdio_establish(struct qdio_initialize *init_data)
         if (cdev->private->state != DEV_STATE_ONLINE)
                 return -EINVAL;
 
-        if (!try_module_get(THIS_MODULE))
-                return -EINVAL;
-
-        sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
-
         mutex_lock(&irq_ptr->setup_mutex);
         qdio_setup_irq(init_data);
 
@@ -1472,6 +1467,9 @@ int qdio_activate(struct ccw_device *cdev)
         unsigned long saveflags;
         char dbf_text[20];
 
+        sprintf(dbf_text, "qact%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
@@ -1485,10 +1483,6 @@ int qdio_activate(struct ccw_device *cdev)
                 goto out;
         }
 
-        sprintf(dbf_text, "qact%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT2(0, setup, dbf_text);
-        QDIO_DBF_TEXT2(0, trace, dbf_text);
-
         irq_ptr->ccw.cmd_code = irq_ptr->aqueue.cmd;
         irq_ptr->ccw.flags = CCW_FLAG_SLI;
         irq_ptr->ccw.count = irq_ptr->aqueue.count;
@@ -1663,7 +1657,7 @@ int do_QDIO(struct ccw_device *cdev, unsigned int callflags,
 #ifdef CONFIG_QDIO_DEBUG
         char dbf_text[20];
 
-        sprintf(dbf_text, "doQD%04x", cdev->private->schid.sch_no);
+        sprintf(dbf_text, "doQD%4x", cdev->private->schid.sch_no);
         QDIO_DBF_TEXT3(0, trace, dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 1bd2a208db28..1679e2f91c94 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -165,7 +165,7 @@ static void setup_queues(struct qdio_irq *irq_ptr,
         void **output_sbal_array = qdio_init->output_sbal_addr_array;
         int i;
 
-        sprintf(dbf_text, "qfqs%4x", qdio_init->cdev->private->schid.sch_no);
+        sprintf(dbf_text, "qset%4x", qdio_init->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0, setup, dbf_text);
 
         for_each_input_queue(irq_ptr, q, i) {
@@ -285,7 +285,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr)
         rc = __get_ssqd_info(irq_ptr);
         if (rc) {
                 QDIO_DBF_TEXT2(0, setup, "ssqdasig");
-                sprintf(dbf_text, "schno%x", irq_ptr->schid.sch_no);
+                sprintf(dbf_text, "schn%4x", irq_ptr->schid.sch_no);
                 QDIO_DBF_TEXT2(0, setup, dbf_text);
                 sprintf(dbf_text, "rc:%d", rc);
                 QDIO_DBF_TEXT2(0, setup, dbf_text);
@@ -447,7 +447,7 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
 {
         char s[80];
 
-        sprintf(s, "%s ", cdev->dev.bus_id);
+        sprintf(s, "%s sc:%x ", cdev->dev.bus_id, irq_ptr->schid.sch_no);
 
         switch (irq_ptr->qib.qfmt) {
         case QDIO_QETH_QFMT:
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index 9291a771d812..ea7f61400267 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -113,7 +113,11 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
         struct qdio_q *q;
         int i;
 
-        for_each_input_queue(irq_ptr, q, i) {
+        for (i = 0; i < irq_ptr->nr_input_qs; i++) {
+                q = irq_ptr->input_qs[i];
+                /* if establish triggered an error */
+                if (!q || !q->entry.prev || !q->entry.next)
+                        continue;
                 list_del_rcu(&q->entry);
                 synchronize_rcu();
         }
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 407f816f091b..cbe470493bf0 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -19,7 +19,6 @@
 #undef DEBUGDATA
 #undef DEBUGCCW
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>