diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-10-10 21:33:13 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-10-10 21:33:52 +0200 |
| commit | 9286b7ed682615c1508210f85d26e4c9a5cbf126 (patch) | |
| tree | d7ef646fd411b7e0a755c343a9013f896db9cbd2 /drivers | |
| parent | 37f1c012f0f23b52df3a0d7850212b336fc9e595 (diff) | |
| download | linux-stable-9286b7ed682615c1508210f85d26e4c9a5cbf126.tar.gz linux-stable-9286b7ed682615c1508210f85d26e4c9a5cbf126.tar.bz2 linux-stable-9286b7ed682615c1508210f85d26e4c9a5cbf126.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/cio/qdio_debug.c | 2 | ||||
| -rw-r--r-- | drivers/s390/cio/qdio_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c index 337aa3087a78..b5390821434f 100644 --- 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 9307512132fe..719066ec0c01 100644 --- 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)); |