[S390] bus_id ->dev_name() conversions in qdio

Use dev_name() in the new qdio driver.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index 337aa3087a78712fa78a4c26f7165e1ba8a03c17..b5390821434f066376b35f7a749cf1331eff8a18 100644 (file)
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -155,7 +155,7 @@ static int qstat_seq_open(struct inode *inode, struct file *filp)
 static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name)
 {
        memset(name, 0, sizeof(name));
-       sprintf(name, "%s", cdev->dev.bus_id);
+       sprintf(name, "%s", dev_name(&cdev->dev));
        if (q->is_input_q)
                sprintf(name + strlen(name), "_input");
        else

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 9307512132fe565f3ea738c7ff2401d9e7a0a552..719066ec0c01f464c9aa64c5551aa454cec6939b 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -962,7 +962,7 @@ static void qdio_handle_activate_check(struct ccw_device *cdev,
        char dbf_text[15];
 
        QDIO_DBF_TEXT2(1, trace, "ick2");
-       sprintf(dbf_text, "%s", cdev->dev.bus_id);
+       sprintf(dbf_text, "%s", dev_name(&cdev->dev));
        QDIO_DBF_TEXT2(1, trace, dbf_text);
        QDIO_DBF_HEX2(0, trace, &intparm, sizeof(int));
        QDIO_DBF_HEX2(0, trace, &dstat, sizeof(int));