12 files changed, 187 insertions, 128 deletions

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index d3ec9b55ab35..9ab06e0dad40 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -21,6 +21,7 @@
 #include <linux/console.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
+#include <linux/reboot.h>
 
 #include <linux/slab.h>
 #include <linux/bootmem.h>
@@ -88,7 +89,6 @@ struct raw3215_info {
         int count;                    /* number of bytes in output buffer */
         int written;                  /* number of bytes in write requests */
         struct tty_struct *tty;       /* pointer to tty structure if present */
-        struct tasklet_struct tasklet;
         struct raw3215_req *queued_read; /* pointer to queued read requests */
         struct raw3215_req *queued_write;/* pointer to queued write requests */
         wait_queue_head_t empty_wait; /* wait queue for flushing */
@@ -341,21 +341,14 @@ raw3215_try_io(struct raw3215_info *raw)
 }
 
 /*
- * The bottom half handler routine for 3215 devices. It tries to start
- * the next IO and wakes up processes waiting on the tty.
+ * Try to start the next IO and wake up processes waiting on the tty.
  */
-static void
-raw3215_tasklet(void *data)
+static void raw3215_next_io(struct raw3215_info *raw)
 {
-        struct raw3215_info *raw;
         struct tty_struct *tty;
-        unsigned long flags;
 
-        raw = (struct raw3215_info *) data;
-        spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
         raw3215_mk_write_req(raw);
         raw3215_try_io(raw);
-        spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
         tty = raw->tty;
         if (tty != NULL &&
             RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
@@ -380,7 +373,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         cstat = irb->scsw.cmd.cstat;
         dstat = irb->scsw.cmd.dstat;
         if (cstat != 0)
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
         if (dstat & 0x01) { /* we got a unit exception */
                 dstat &= ~0x01;  /* we can ignore it */
         }
@@ -390,7 +383,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         break;
                 /* Attention interrupt, someone hit the enter key */
                 raw3215_mk_read_req(raw);
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
                 break;
         case 0x08:
         case 0x0C:
@@ -448,7 +441,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                     raw->queued_read == NULL) {
                         wake_up_interruptible(&raw->empty_wait);
                 }
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
                 break;
         default:
                 /* Strange interrupt, I'll do my best to clean up */
@@ -460,7 +453,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         raw->flags &= ~RAW3215_WORKING;
                         raw3215_free_req(req);
                 }
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
         }
         return;
 }
@@ -674,9 +667,6 @@ raw3215_probe (struct ccw_device *cdev)
                 kfree(raw);
                 return -ENOMEM;
         }
-        tasklet_init(&raw->tasklet,
-                     (void (*)(unsigned long)) raw3215_tasklet,
-                     (unsigned long) raw);
         init_waitqueue_head(&raw->empty_wait);
 
         cdev->dev.driver_data = raw;
@@ -775,11 +765,11 @@ static struct tty_driver *con3215_device(struct console *c, int *index)
 }
 
 /*
- * panic() calls console_unblank before the system enters a
- * disabled, endless loop.
+ * panic() calls con3215_flush through a panic_notifier
+ * before the system enters a disabled, endless loop.
  */
 static void
-con3215_unblank(void)
+con3215_flush(void)
 {
         struct raw3215_info *raw;
         unsigned long flags;
@@ -790,6 +780,23 @@ con3215_unblank(void)
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
 }
 
+static int con3215_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
+{
+        con3215_flush();
+        return NOTIFY_OK;
+}
+
+static struct notifier_block on_panic_nb = {
+        .notifier_call = con3215_notify,
+        .priority = 0,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = con3215_notify,
+        .priority = 0,
+};
+
 /*
  *  The console structure for the 3215 console
  */
@@ -797,7 +804,6 @@ static struct console con3215 = {
         .name    = "ttyS",
         .write   = con3215_write,
         .device  = con3215_device,
-        .unblank = con3215_unblank,
         .flags   = CON_PRINTBUFFER,
 };
 
@@ -846,9 +852,6 @@ con3215_init(void)
         cdev->handler = raw3215_irq;
 
         raw->flags |= RAW3215_FIXED;
-        tasklet_init(&raw->tasklet,
-                     (void (*)(unsigned long)) raw3215_tasklet,
-                     (unsigned long) raw);
         init_waitqueue_head(&raw->empty_wait);
 
         /* Request the console irq */
@@ -859,6 +862,8 @@ con3215_init(void)
                 raw3215[0] = NULL;
                 return -ENODEV;
         }
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&con3215);
         return 0;
 }
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index 3c07974886ed..d028d2ee83dd 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/types.h>
 #include <linux/err.h>
+#include <linux/reboot.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -528,11 +529,11 @@ con3270_wait_write(struct con3270 *cp)
 }
 
 /*
- * panic() calls console_unblank before the system enters a
- * disabled, endless loop.
+ * panic() calls con3270_flush through a panic_notifier
+ * before the system enters a disabled, endless loop.
  */
 static void
-con3270_unblank(void)
+con3270_flush(void)
 {
         struct con3270 *cp;
         unsigned long flags;
@@ -554,6 +555,23 @@ con3270_unblank(void)
         spin_unlock_irqrestore(&cp->view.lock, flags);
 }
 
+static int con3270_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
+{
+        con3270_flush();
+        return NOTIFY_OK;
+}
+
+static struct notifier_block on_panic_nb = {
+        .notifier_call = con3270_notify,
+        .priority = 0,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = con3270_notify,
+        .priority = 0,
+};
+
 /*
  *  The console structure for the 3270 console
  */
@@ -561,7 +579,6 @@ static struct console con3270 = {
         .name    = "tty3270",
         .write   = con3270_write,
         .device  = con3270_device,
-        .unblank = con3270_unblank,
         .flags   = CON_PRINTBUFFER,
 };
 
@@ -623,6 +640,8 @@ con3270_init(void)
         condev->cline->len = 0;
         con3270_create_status(condev);
         condev->input = alloc_string(&condev->freemem, 80);
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&con3270);
         return 0;
 }
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index c3dee900a5c8..1792b2c0130e 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1171,7 +1171,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
         rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
                                              MKDEV(IBM_TTY3270_MAJOR, rp->minor),
                                              NULL,
-                                             "tty%s", rp->cdev->dev.bus_id);
+                                             "tty%s", dev_name(&rp->cdev->dev));
         if (IS_ERR(rp->clttydev)) {
                 rc = PTR_ERR(rp->clttydev);
                 goto out_ttydev;
@@ -1180,7 +1180,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
         rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
                                              MKDEV(IBM_FS3270_MAJOR, rp->minor),
                                              NULL,
-                                             "tub%s", rp->cdev->dev.bus_id);
+                                             "tub%s", dev_name(&rp->cdev->dev));
         if (!IS_ERR(rp->cltubdev))
                 goto out;
 
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c
index 7e619c534bf4..9a25c4bd1421 100644
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -16,6 +16,7 @@
 #include <linux/bootmem.h>
 #include <linux/termios.h>
 #include <linux/err.h>
+#include <linux/reboot.h>
 
 #include "sclp.h"
 #include "sclp_rw.h"
@@ -172,7 +173,7 @@ sclp_console_device(struct console *c, int *index)
  * will be flushed to the SCLP.
  */
 static void
-sclp_console_unblank(void)
+sclp_console_flush(void)
 {
         unsigned long flags;
 
@@ -188,6 +189,24 @@ sclp_console_unblank(void)
         spin_unlock_irqrestore(&sclp_con_lock, flags);
 }
 
+static int
+sclp_console_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
+{
+        sclp_console_flush();
+        return NOTIFY_OK;
+}
+
+static struct notifier_block on_panic_nb = {
+        .notifier_call = sclp_console_notify,
+        .priority = 1,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = sclp_console_notify,
+        .priority = 1,
+};
+
 /*
  * used to register the SCLP console to the kernel and to
  * give printk necessary information
@@ -197,7 +216,6 @@ static struct console sclp_console =
         .name = sclp_console_name,
         .write = sclp_console_write,
         .device = sclp_console_device,
-        .unblank = sclp_console_unblank,
         .flags = CON_PRINTBUFFER,
         .index = 0 /* ttyS0 */
 };
@@ -241,6 +259,8 @@ sclp_console_init(void)
         sclp_con_width_htab = 8;
 
         /* enable printk-access to this driver */
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&sclp_console);
         return 0;
 }
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index ad51738c4261..9854f19f5e62 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -24,6 +24,8 @@
 #include <linux/bootmem.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/reboot.h>
+
 #include <asm/uaccess.h>
 #include "sclp.h"
 
@@ -743,24 +745,30 @@ sclp_vt220_con_device(struct console *c, int *index)
         return sclp_vt220_driver;
 }
 
-/*
- * This routine is called from panic when the kernel is going to give up.
- * We have to make sure that all buffers will be flushed to the SCLP.
- * Note that this function may be called from within an interrupt context.
- */
-static void
-sclp_vt220_con_unblank(void)
+static int
+sclp_vt220_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
 {
         __sclp_vt220_flush_buffer();
+        return NOTIFY_OK;
 }
 
+static struct notifier_block on_panic_nb = {
+        .notifier_call = sclp_vt220_notify,
+        .priority = 1,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = sclp_vt220_notify,
+        .priority = 1,
+};
+
 /* Structure needed to register with printk */
 static struct console sclp_vt220_console =
 {
         .name = SCLP_VT220_CONSOLE_NAME,
         .write = sclp_vt220_con_write,
         .device = sclp_vt220_con_device,
-        .unblank = sclp_vt220_con_unblank,
         .flags = CON_PRINTBUFFER,
         .index = SCLP_VT220_CONSOLE_INDEX
 };
@@ -776,6 +784,8 @@ sclp_vt220_con_init(void)
         if (rc)
                 return rc;
         /* Attach linux console */
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&sclp_vt220_console);
         return 0;
 }
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 839987618ffd..4005c44a404c 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -910,7 +910,7 @@ tape_3590_erp_swap(struct tape_device *device, struct tape_request *request,
          * should proceed with the new tape... this
          * should probably be done in user space!
          */
-        PRINT_WARN("(%s): Swap Tape Device!\n", device->cdev->dev.bus_id);
+        PRINT_WARN("(%s): Swap Tape Device!\n", dev_name(&device->cdev->dev));
         return tape_3590_erp_basic(device, request, irb, -EIO);
 }
 
@@ -1003,40 +1003,43 @@ tape_3590_print_mim_msg_f0(struct tape_device *device, struct irb *irb)
         /* Exception Message */
         switch (sense->fmt.f70.emc) {
         case 0x02:
-                PRINT_WARN("(%s): Data degraded\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Data degraded\n",
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 PRINT_WARN("(%s): Data degraded in partion %i\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.mp);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.mp);
                 break;
         case 0x04:
-                PRINT_WARN("(%s): Medium degraded\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Medium degraded\n",
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x05:
                 PRINT_WARN("(%s): Medium degraded in partition %i\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.mp);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.mp);
                 break;
         case 0x06:
-                PRINT_WARN("(%s): Block 0 Error\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Block 0 Error\n",
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x07:
                 PRINT_WARN("(%s): Medium Exception 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.md);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.md);
                 break;
         default:
                 PRINT_WARN("(%s): MIM ExMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.emc);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.emc);
                 break;
         }
         /* Service Message */
         switch (sense->fmt.f70.smc) {
         case 0x02:
                 PRINT_WARN("(%s): Reference Media maintenance procedure %i\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.md);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.md);
                 break;
         default:
                 PRINT_WARN("(%s): MIM ServiceMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.smc);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.smc);
                 break;
         }
 }
@@ -1054,101 +1057,101 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb)
         switch (sense->fmt.f71.emc) {
         case 0x01:
                 PRINT_WARN("(%s): Effect of failure is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): CU Exception - no performance impact\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 PRINT_WARN("(%s): CU Exception on channel interface 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x04:
                 PRINT_WARN("(%s): CU Exception on device path 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x05:
                 PRINT_WARN("(%s): CU Exception on library path 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x06:
                 PRINT_WARN("(%s): CU Exception on node 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x07:
                 PRINT_WARN("(%s): CU Exception on partition 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         default:
                 PRINT_WARN("(%s): SIM ExMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.emc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.emc);
         }
         /* Service Message */
         switch (sense->fmt.f71.smc) {
         case 0x01:
                 PRINT_WARN("(%s): Repair impact is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): Repair will not impact cu performance\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable node "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable nodes "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x04:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable cannel path "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable cannel paths "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x05:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable device path "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable device paths "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x06:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable library path "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable library paths "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x07:
                 PRINT_WARN("(%s): Repair will disable access to CU\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         default:
                 PRINT_WARN("(%s): SIM ServiceMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.smc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.smc);
         }
 }
 
@@ -1165,104 +1168,104 @@ tape_3590_print_dev_sim_msg_f2(struct tape_device *device, struct irb *irb)
         switch (sense->fmt.f71.emc) {
         case 0x01:
                 PRINT_WARN("(%s): Effect of failure is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): DV Exception - no performance impact\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 PRINT_WARN("(%s): DV Exception on channel interface 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x04:
                 PRINT_WARN("(%s): DV Exception on loader 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x05:
                 PRINT_WARN("(%s): DV Exception on message display 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x06:
                 PRINT_WARN("(%s): DV Exception in tape path\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x07:
                 PRINT_WARN("(%s): DV Exception in drive\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         default:
                 PRINT_WARN("(%s): DSIM ExMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.emc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.emc);
         }
         /* Service Message */
         switch (sense->fmt.f71.smc) {
         case 0x01:
                 PRINT_WARN("(%s): Repair impact is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): Repair will not impact device performance\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable channel path "
                                    "0x%x on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable channel path "
                                    "(0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x04:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable interface 0x%x "
                                    "on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable interfaces "
                                    "(0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x05:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable loader 0x%x "
                                    "on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable loader "
                                    "(0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x07:
                 PRINT_WARN("(%s): Repair will disable access to DV\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x08:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable message "
                                    "display 0x%x on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable message "
                                    "displays (0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x09:
-                PRINT_WARN("(%s): Clean DV\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Clean DV\n", dev_name(&device->cdev->dev));
                 break;
         default:
                 PRINT_WARN("(%s): DSIM ServiceMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.smc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.smc);
         }
 }
 
@@ -1279,18 +1282,18 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 return;
         if ((sense->mc > 0) && (sense->mc < TAPE_3590_MAX_MSG)) {
                 if (tape_3590_msg[sense->mc] != NULL)
-                        PRINT_WARN("(%s): %s\n", device->cdev->dev.bus_id,
+                        PRINT_WARN("(%s): %s\n", dev_name(&device->cdev->dev),
                                    tape_3590_msg[sense->mc]);
                 else {
                         PRINT_WARN("(%s): Message Code 0x%x\n",
-                                   device->cdev->dev.bus_id, sense->mc);
+                                   dev_name(&device->cdev->dev), sense->mc);
                 }
                 return;
         }
         if (sense->mc == 0xf0) {
                 /* Standard Media Information Message */
                 PRINT_WARN("(%s): MIM SEV=%i, MC=%02x, ES=%x/%x, "
-                           "RC=%02x-%04x-%02x\n", device->cdev->dev.bus_id,
+                           "RC=%02x-%04x-%02x\n", dev_name(&device->cdev->dev),
                            sense->fmt.f70.sev, sense->mc,
                            sense->fmt.f70.emc, sense->fmt.f70.smc,
                            sense->fmt.f70.refcode, sense->fmt.f70.mid,
@@ -1302,7 +1305,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 /* Standard I/O Subsystem Service Information Message */
                 PRINT_WARN("(%s): IOSIM SEV=%i, DEVTYPE=3590/%02x, "
                            "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.sev,
+                           dev_name(&device->cdev->dev), sense->fmt.f71.sev,
                            device->cdev->id.dev_model,
                            sense->mc, sense->fmt.f71.emc,
                            sense->fmt.f71.smc, sense->fmt.f71.refcode1,
@@ -1314,7 +1317,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 /* Standard Device Service Information Message */
                 PRINT_WARN("(%s): DEVSIM SEV=%i, DEVTYPE=3590/%02x, "
                            "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.sev,
+                           dev_name(&device->cdev->dev), sense->fmt.f71.sev,
                            device->cdev->id.dev_model,
                            sense->mc, sense->fmt.f71.emc,
                            sense->fmt.f71.smc, sense->fmt.f71.refcode1,
@@ -1327,7 +1330,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 return;
         }
         PRINT_WARN("(%s): Device Message(%x)\n",
-                   device->cdev->dev.bus_id, sense->mc);
+                   dev_name(&device->cdev->dev), sense->mc);
 }
 
 static int tape_3590_crypt_error(struct tape_device *device,
@@ -1336,10 +1339,11 @@ static int tape_3590_crypt_error(struct tape_device *device,
         u8 cu_rc, ekm_rc1;
         u16 ekm_rc2;
         u32 drv_rc;
-        char *bus_id, *sense;
+        const char *bus_id;
+        char *sense;
 
         sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data;
-        bus_id = device->cdev->dev.bus_id;
+        bus_id = dev_name(&device->cdev->dev);
         cu_rc = sense[0];
         drv_rc = *((u32*) &sense[5]) & 0xffffff;
         ekm_rc1 = sense[9];
@@ -1440,7 +1444,7 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
                  * "device intervention" is not very meaningfull
                  */
                 PRINT_WARN("(%s): Tape operation when medium not loaded\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 tape_med_state_set(device, MS_UNLOADED);
                 tape_3590_schedule_work(device, TO_CRYPT_OFF);
                 return tape_3590_erp_basic(device, request, irb, -ENOMEDIUM);
@@ -1487,18 +1491,18 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
 
         case 0x6020:
                 PRINT_WARN("(%s): Cartridge of wrong type ?\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 return tape_3590_erp_basic(device, request, irb, -EMEDIUMTYPE);
 
         case 0x8011:
                 PRINT_WARN("(%s): Another host has reserved the tape device\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 return tape_3590_erp_basic(device, request, irb, -EPERM);
         case 0x8013:
                 PRINT_WARN("(%s): Another host has privileged access to the "
-                           "tape device\n", device->cdev->dev.bus_id);
+                           "tape device\n", dev_name(&device->cdev->dev));
                 PRINT_WARN("(%s): To solve the problem unload the current "
-                           "cartridge!\n", device->cdev->dev.bus_id);
+                           "cartridge!\n", dev_name(&device->cdev->dev));
                 return tape_3590_erp_basic(device, request, irb, -EPERM);
         default:
                 return tape_3590_erp_basic(device, request, irb, -EIO);
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 95da72bc17e8..a25b8bf54f41 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -278,7 +278,7 @@ tapeblock_cleanup_device(struct tape_device *device)
 
         if (!device->blk_data.disk) {
                 PRINT_ERR("(%s): No gendisk to clean up!\n",
-                        device->cdev->dev.bus_id);
+                        dev_name(&device->cdev->dev));
                 goto cleanup_queue;
         }
 
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 181a5441af16..d7073dbf825c 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -215,12 +215,12 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate)
         case MS_UNLOADED:
                 device->tape_generic_status |= GMT_DR_OPEN(~0);
                 PRINT_INFO("(%s): Tape is unloaded\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case MS_LOADED:
                 device->tape_generic_status &= ~GMT_DR_OPEN(~0);
                 PRINT_INFO("(%s): Tape has been mounted\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         default:
                 // print nothing
@@ -415,7 +415,7 @@ tape_generic_offline(struct tape_device *device)
                                 device->cdev_id);
                         PRINT_WARN("(%s): Set offline failed "
                                 "- drive in use.\n",
-                                device->cdev->dev.bus_id);
+                                dev_name(&device->cdev->dev));
                         spin_unlock_irq(get_ccwdev_lock(device->cdev));
                         return -EBUSY;
         }
@@ -538,7 +538,8 @@ tape_generic_probe(struct ccw_device *cdev)
         ret = sysfs_create_group(&cdev->dev.kobj, &tape_attr_group);
         if (ret) {
                 tape_put_device(device);
-                PRINT_ERR("probe failed for tape device %s\n", cdev->dev.bus_id);
+                PRINT_ERR("probe failed for tape device %s\n",
+                          dev_name(&cdev->dev));
                 return ret;
         }
         cdev->dev.driver_data = device;
@@ -546,7 +547,7 @@ tape_generic_probe(struct ccw_device *cdev)
         device->cdev = cdev;
         ccw_device_get_id(cdev, &dev_id);
         device->cdev_id = devid_to_int(&dev_id);
-        PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
+        PRINT_INFO("tape device %s found\n", dev_name(&cdev->dev));
         return ret;
 }
 
@@ -616,7 +617,7 @@ tape_generic_remove(struct ccw_device *cdev)
                                 device->cdev_id);
                         PRINT_WARN("(%s): Drive in use vanished - "
                                 "expect trouble!\n",
-                                device->cdev->dev.bus_id);
+                                dev_name(&device->cdev->dev));
                         PRINT_WARN("State was %i\n", device->tape_state);
                         tape_state_set(device, TS_NOT_OPER);
                         __tape_discard_requests(device);
@@ -840,7 +841,7 @@ tape_dump_sense(struct tape_device* device, struct tape_request *request,
         PRINT_INFO("-------------------------------------------------\n");
         PRINT_INFO("DSTAT : %02x  CSTAT: %02x   CPA: %04x\n",
                    irb->scsw.cmd.dstat, irb->scsw.cmd.cstat, irb->scsw.cmd.cpa);
-        PRINT_INFO("DEVICE: %s\n", device->cdev->dev.bus_id);
+        PRINT_INFO("DEVICE: %s\n", dev_name(&device->cdev->dev));
         if (request != NULL)
                 PRINT_INFO("OP    : %s\n", tape_op_verbose[request->op]);
 
@@ -1051,7 +1052,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         device = (struct tape_device *) cdev->dev.driver_data;
         if (device == NULL) {
                 PRINT_ERR("could not get device structure for %s "
-                          "in interrupt\n", cdev->dev.bus_id);
+                          "in interrupt\n", dev_name(&cdev->dev));
                 return;
         }
         request = (struct tape_request *) intparm;
@@ -1064,13 +1065,13 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 switch (PTR_ERR(irb)) {
                         case -ETIMEDOUT:
                                 PRINT_WARN("(%s): Request timed out\n",
-                                        cdev->dev.bus_id);
+                                        dev_name(&cdev->dev));
                         case -EIO:
                                 __tape_end_request(device, request, -EIO);
                                 break;
                         default:
                                 PRINT_ERR("(%s): Unexpected i/o error %li\n",
-                                        cdev->dev.bus_id,
+                                        dev_name(&cdev->dev),
                                         PTR_ERR(irb));
                 }
                 return;
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index e7c888c14e71..8a376af926a7 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -52,7 +52,7 @@ static int tape_proc_show(struct seq_file *m, void *v)
                 return 0;
         spin_lock_irq(get_ccwdev_lock(device->cdev));
         seq_printf(m, "%d\t", (int) n);
-        seq_printf(m, "%-10.10s ", device->cdev->dev.bus_id);
+        seq_printf(m, "%-10.10s ", dev_name(&device->cdev->dev));
         seq_printf(m, "%04X/", device->cdev->id.cu_type);
         seq_printf(m, "%02X\t", device->cdev->id.cu_model);
         seq_printf(m, "%04X/", device->cdev->id.dev_type);
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index cc8fd781ee22..5bd573d144d6 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -47,7 +47,7 @@ tape_std_assign_timeout(unsigned long data)
         rc = tape_cancel_io(device, request);
         if(rc)
                 PRINT_ERR("(%s): Assign timeout: Cancel failed with rc = %i\n",
-                        device->cdev->dev.bus_id, rc);
+                        dev_name(&device->cdev->dev), rc);
 
 }
 
@@ -83,7 +83,7 @@ tape_std_assign(struct tape_device *device)
 
         if (rc != 0) {
                 PRINT_WARN("%s: assign failed - device might be busy\n",
-                        device->cdev->dev.bus_id);
+                        dev_name(&device->cdev->dev));
                 DBF_EVENT(3, "%08x: assign failed - device might be busy\n",
                         device->cdev_id);
         } else {
@@ -106,7 +106,7 @@ tape_std_unassign (struct tape_device *device)
                 DBF_EVENT(3, "(%08x): Can't unassign device\n",
                         device->cdev_id);
                 PRINT_WARN("(%s): Can't unassign device - device gone\n",
-                        device->cdev->dev.bus_id);
+                        dev_name(&device->cdev->dev));
                 return -EIO;
         }
 
@@ -120,7 +120,8 @@ tape_std_unassign (struct tape_device *device)
 
         if ((rc = tape_do_io(device, request)) != 0) {
                 DBF_EVENT(3, "%08x: Unassign failed\n", device->cdev_id);
-                PRINT_WARN("%s: Unassign failed\n", device->cdev->dev.bus_id);
+                PRINT_WARN("%s: Unassign failed\n",
+                           dev_name(&device->cdev->dev));
         } else {
                 DBF_EVENT(3, "%08x: Tape unassigned\n", device->cdev_id);
         }
@@ -634,10 +635,10 @@ tape_std_mtcompression(struct tape_device *device, int mt_count)
                 DBF_EXCEPTION(6, "xcom parm\n");
                 if (*device->modeset_byte & 0x08)
                         PRINT_INFO("(%s) Compression is currently on\n",
-                                   device->cdev->dev.bus_id);
+                                   dev_name(&device->cdev->dev));
                 else
                         PRINT_INFO("(%s) Compression is currently off\n",
-                                   device->cdev->dev.bus_id);
+                                   dev_name(&device->cdev->dev));
                 PRINT_INFO("Use 1 to switch compression on, 0 to "
                            "switch it off\n");
                 return -EINVAL;
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index c31faefa2b3b..42173cc34610 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -724,8 +724,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
 
         dev = kzalloc(sizeof(struct device), GFP_KERNEL);
         if (dev) {
-                snprintf(dev->bus_id, BUS_ID_SIZE, "%s",
-                         priv->internal_name);
+                dev_set_name(dev, priv->internal_name);
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
                 dev->driver = &vmlogrdr_driver;
@@ -751,7 +750,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
         priv->class_device = device_create_drvdata(vmlogrdr_class, dev,
                                                    MKDEV(vmlogrdr_major,
                                                          priv->minor_num),
-                                                   priv, "%s", dev->bus_id);
+                                                   priv, "%s", dev_name(dev));
         if (IS_ERR(priv->class_device)) {
                 ret = PTR_ERR(priv->class_device);
                 priv->class_device=NULL;
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index c1f352b84868..6fdfa5ddeca8 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -886,11 +886,11 @@ static int ur_set_online(struct ccw_device *cdev)
                 goto fail_free_cdev;
         if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) {
                 if (urd->class == DEV_CLASS_UR_I)
-                        sprintf(node_id, "vmrdr-%s", cdev->dev.bus_id);
+                        sprintf(node_id, "vmrdr-%s", dev_name(&cdev->dev));
                 if (urd->class == DEV_CLASS_UR_O)
-                        sprintf(node_id, "vmpun-%s", cdev->dev.bus_id);
+                        sprintf(node_id, "vmpun-%s", dev_name(&cdev->dev));
         } else if (urd->cdev->id.cu_type == PRINTER_DEVTYPE) {
-                sprintf(node_id, "vmprt-%s", cdev->dev.bus_id);
+                sprintf(node_id, "vmprt-%s", dev_name(&cdev->dev));
         } else {
                 rc = -EOPNOTSUPP;
                 goto fail_free_cdev;