[S390] bus_id -> dev_set_name() for css and ccw busses

Convert remaining s390 users setting bus_id to dev_set_name()
or init_name.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

3 files changed, 29 insertions, 4 deletions

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 8759912734e0..719d6c406e97 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -571,8 +571,10 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
         }
         mutex_init(&sch->reg_mutex);
         /* Set a name for the subchannel */
-        snprintf (sch->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x", schid.ssid,
-                  schid.sch_no);
+        if (cio_is_console(schid))
+                sch->dev.init_name = cio_get_console_sch_name(schid);
+        else
+                dev_set_name(&sch->dev, "0.%x.%04x", schid.ssid, schid.sch_no);
 
         /*
          * The first subchannel that is not-operational (ccode==3)
@@ -677,6 +679,7 @@ do_IRQ (struct pt_regs *regs)
 
 #ifdef CONFIG_CCW_CONSOLE
 static struct subchannel console_subchannel;
+static char console_sch_name[10] = "0.x.xxxx";
 static struct io_subchannel_private console_priv;
 static int console_subchannel_in_use;
 
@@ -827,6 +830,12 @@ cio_get_console_subchannel(void)
         return &console_subchannel;
 }
 
+const char *cio_get_console_sch_name(struct subchannel_id schid)
+{
+        snprintf(console_sch_name, 10, "0.%x.%04x", schid.ssid, schid.sch_no);
+        return (const char *)console_sch_name;
+}
+
 #endif
 static int
 __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 3b236d20e835..0fb24784e925 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -117,11 +117,15 @@ extern int cio_is_console(struct subchannel_id);
 extern struct subchannel *cio_get_console_subchannel(void);
 extern spinlock_t * cio_get_console_lock(void);
 extern void *cio_get_console_priv(void);
+extern const char *cio_get_console_sch_name(struct subchannel_id schid);
+extern const char *cio_get_console_cdev_name(struct subchannel *sch);
 #else
 #define cio_is_console(schid) 0
 #define cio_get_console_subchannel() NULL
 #define cio_get_console_lock() NULL
 #define cio_get_console_priv() NULL
+#define cio_get_console_sch_name(schid) NULL
+#define cio_get_console_cdev_name(sch) NULL
 #endif
 
 #endif
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index a8e755a88b01..4e78c82194b4 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1035,8 +1035,11 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
         init_timer(&priv->timer);
 
         /* Set an initial name for the device. */
-        snprintf (cdev->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x",
-                  sch->schid.ssid, sch->schib.pmcw.dev);
+        if (cio_is_console(sch->schid))
+                cdev->dev.init_name = cio_get_console_cdev_name(sch);
+        else
+                dev_set_name(&cdev->dev, "0.%x.%04x",
+                             sch->schid.ssid, sch->schib.pmcw.dev);
 
         /* Increase counter of devices currently in recognition. */
         atomic_inc(&ccw_device_init_count);
@@ -1625,6 +1628,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
 
 #ifdef CONFIG_CCW_CONSOLE
 static struct ccw_device console_cdev;
+static char console_cdev_name[10] = "0.x.xxxx";
 static struct ccw_device_private console_private;
 static int console_cdev_in_use;
 
@@ -1695,6 +1699,14 @@ ccw_device_probe_console(void)
         console_cdev.online = 1;
         return &console_cdev;
 }
+
+
+const char *cio_get_console_cdev_name(struct subchannel *sch)
+{
+        snprintf(console_cdev_name, 10, "0.%x.%04x",
+                 sch->schid.ssid, sch->schib.pmcw.dev);
+        return (const char *)console_cdev_name;
+}
 #endif
 
 /*