[S390] cio: remove ccw_device init_name

We used the init_name to set the console ccw_device's name early
at the boot stage. This patch moves the name setting (for all ccw
devices) to the point where we actually register the device. At this
time we can do dynamic allocations and therefore use dev_set_name.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 883e19d83e43e26236b7744a79e956378c9bbc42..2e43558c704b915a5779aa5613626dbb6fc15a5f 100644 (file)
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -133,13 +133,11 @@ 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_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_cdev_name(sch) NULL
 #endif
 
 #endif

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 345a61f45a5a7d6a398ba2418bab27013d891ac2..0f95405c2c5e0b05dec472dbae6c29aba6571d5f 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -669,8 +669,12 @@ static int ccw_device_register(struct ccw_device *cdev)
        int ret;
 
        dev->bus = &ccw_bus_type;
-
-       if ((ret = device_add(dev)))
+       ret = dev_set_name(&cdev->dev, "0.%x.%04x", cdev->private->dev_id.ssid,
+                          cdev->private->dev_id.devno);
+       if (ret)
+               return ret;
+       ret = device_add(dev);
+       if (ret)
                return ret;
 
        set_bit(1, &cdev->private->registered);
@@ -1124,13 +1128,6 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
        init_waitqueue_head(&priv->wait_q);
        init_timer(&priv->timer);
 
-       /* Set an initial name for the device. */
-       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);
 
@@ -1731,7 +1728,6 @@ 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;
 
@@ -1815,13 +1811,6 @@ int ccw_device_force_console(void)
        return ccw_device_pm_restore(&console_cdev.dev);
 }
 EXPORT_SYMBOL_GPL(ccw_device_force_console);
-
-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
 
 /*