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/cio/device_fsm.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/cio/device_fsm.c')
-rw-r--r-- | drivers/s390/cio/device_fsm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 84cc9ea346db..10bc03940fb3 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c | |||
@@ -52,8 +52,10 @@ static void ccw_timeout_log(struct ccw_device *cdev) | |||
52 | printk(KERN_WARNING "cio: orb:\n"); | 52 | printk(KERN_WARNING "cio: orb:\n"); |
53 | print_hex_dump(KERN_WARNING, "cio: ", DUMP_PREFIX_NONE, 16, 1, | 53 | print_hex_dump(KERN_WARNING, "cio: ", DUMP_PREFIX_NONE, 16, 1, |
54 | orb, sizeof(*orb), 0); | 54 | orb, sizeof(*orb), 0); |
55 | printk(KERN_WARNING "cio: ccw device bus id: %s\n", cdev->dev.bus_id); | 55 | printk(KERN_WARNING "cio: ccw device bus id: %s\n", |
56 | printk(KERN_WARNING "cio: subchannel bus id: %s\n", sch->dev.bus_id); | 56 | dev_name(&cdev->dev)); |
57 | printk(KERN_WARNING "cio: subchannel bus id: %s\n", | ||
58 | dev_name(&sch->dev)); | ||
57 | printk(KERN_WARNING "cio: subchannel lpm: %02x, opm: %02x, " | 59 | printk(KERN_WARNING "cio: subchannel lpm: %02x, opm: %02x, " |
58 | "vpm: %02x\n", sch->lpm, sch->opm, sch->vpm); | 60 | "vpm: %02x\n", sch->lpm, sch->opm, sch->vpm); |
59 | 61 | ||