diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-10 15:33:09 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-10-10 15:33:49 -0400 |
commit | 2a0217d5c7d22d6dd28f8ae5d20b06d24dc426b8 (patch) | |
tree | 0a7d60ac06dbc234d48da5a5b2ce8fa186a20182 /drivers/s390/char/vmur.c | |
parent | e4a1afaeb1d9ebc09f46d8b229ac96116974b1b8 (diff) |
[S390] bus_id -> dev_name conversions
bus_id -> dev_name() conversions in s390 code.
[cornelia.huck@de.ibm.com: minor adaptions]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/vmur.c')
-rw-r--r-- | drivers/s390/char/vmur.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c index c1f352b84868..6fdfa5ddeca8 100644 --- a/drivers/s390/char/vmur.c +++ b/drivers/s390/char/vmur.c | |||
@@ -886,11 +886,11 @@ static int ur_set_online(struct ccw_device *cdev) | |||
886 | goto fail_free_cdev; | 886 | goto fail_free_cdev; |
887 | if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) { | 887 | if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) { |
888 | if (urd->class == DEV_CLASS_UR_I) | 888 | if (urd->class == DEV_CLASS_UR_I) |
889 | sprintf(node_id, "vmrdr-%s", cdev->dev.bus_id); | 889 | sprintf(node_id, "vmrdr-%s", dev_name(&cdev->dev)); |
890 | if (urd->class == DEV_CLASS_UR_O) | 890 | if (urd->class == DEV_CLASS_UR_O) |
891 | sprintf(node_id, "vmpun-%s", cdev->dev.bus_id); | 891 | sprintf(node_id, "vmpun-%s", dev_name(&cdev->dev)); |
892 | } else if (urd->cdev->id.cu_type == PRINTER_DEVTYPE) { | 892 | } else if (urd->cdev->id.cu_type == PRINTER_DEVTYPE) { |
893 | sprintf(node_id, "vmprt-%s", cdev->dev.bus_id); | 893 | sprintf(node_id, "vmprt-%s", dev_name(&cdev->dev)); |
894 | } else { | 894 | } else { |
895 | rc = -EOPNOTSUPP; | 895 | rc = -EOPNOTSUPP; |
896 | goto fail_free_cdev; | 896 | goto fail_free_cdev; |