Commit 9286b7ed authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

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



Use dev_name() in the new qdio driver.
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 37f1c012
...@@ -155,7 +155,7 @@ static int qstat_seq_open(struct inode *inode, struct file *filp) ...@@ -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) static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name)
{ {
memset(name, 0, sizeof(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) if (q->is_input_q)
sprintf(name + strlen(name), "_input"); sprintf(name + strlen(name), "_input");
else else
......
...@@ -962,7 +962,7 @@ static void qdio_handle_activate_check(struct ccw_device *cdev, ...@@ -962,7 +962,7 @@ static void qdio_handle_activate_check(struct ccw_device *cdev,
char dbf_text[15]; char dbf_text[15];
QDIO_DBF_TEXT2(1, trace, "ick2"); 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_TEXT2(1, trace, dbf_text);
QDIO_DBF_HEX2(0, trace, &intparm, sizeof(int)); QDIO_DBF_HEX2(0, trace, &intparm, sizeof(int));
QDIO_DBF_HEX2(0, trace, &dstat, sizeof(int)); QDIO_DBF_HEX2(0, trace, &dstat, sizeof(int));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment