[S390] struct device - replace bus_id with dev_name(), dev_set_name()

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / ccwgroup.c

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 3ac2c2019f5e28ffae89e7c0d07f965be297f500..17fa009d9959788783e7c821b6b04575df45b4f5 100644 (file)
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -19,6 +19,8 @@
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 
+#define CCW_BUS_ID_SIZE                20
+
 /* In Linux 2.4, we had a channel device layer called "chandev"
  * that did all sorts of obscure stuff for networking devices.
  * This is another driver that serves as a replacement for just
@@ -172,7 +174,7 @@ static int __get_next_bus_id(const char **buf, char *bus_id)
                len = end - start + 1;
                end++;
        }
-       if (len < BUS_ID_SIZE) {
+       if (len < CCW_BUS_ID_SIZE) {
                strlcpy(bus_id, start, len);
                rc = 0;
        } else
@@ -181,7 +183,7 @@ static int __get_next_bus_id(const char **buf, char *bus_id)
        return rc;
 }
 
-static int __is_valid_bus_id(char bus_id[BUS_ID_SIZE])
+static int __is_valid_bus_id(char bus_id[CCW_BUS_ID_SIZE])
 {
        int cssid, ssid, devno;
 
@@ -213,7 +215,7 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
 {
        struct ccwgroup_device *gdev;
        int rc, i;
-       char tmp_bus_id[BUS_ID_SIZE];
+       char tmp_bus_id[CCW_BUS_ID_SIZE];
        const char *curr_buf;
 
        gdev = kzalloc(sizeof(*gdev) + num_devices * sizeof(gdev->cdev[0]),