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/block/dcssblk.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/block/dcssblk.c')
-rw-r--r-- | drivers/s390/block/dcssblk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 9481e4a3f76e..2aca79e952b0 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
@@ -91,7 +91,7 @@ static struct rw_semaphore dcssblk_devices_sem; | |||
91 | static void | 91 | static void |
92 | dcssblk_release_segment(struct device *dev) | 92 | dcssblk_release_segment(struct device *dev) |
93 | { | 93 | { |
94 | PRINT_DEBUG("segment release fn called for %s\n", dev->bus_id); | 94 | PRINT_DEBUG("segment release fn called for %s\n", dev_name(dev)); |
95 | kfree(container_of(dev, struct dcssblk_dev_info, dev)); | 95 | kfree(container_of(dev, struct dcssblk_dev_info, dev)); |
96 | module_put(THIS_MODULE); | 96 | module_put(THIS_MODULE); |
97 | } | 97 | } |
@@ -602,7 +602,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) | |||
602 | case SEG_TYPE_SC: | 602 | case SEG_TYPE_SC: |
603 | /* cannot write to these segments */ | 603 | /* cannot write to these segments */ |
604 | if (bio_data_dir(bio) == WRITE) { | 604 | if (bio_data_dir(bio) == WRITE) { |
605 | PRINT_WARN("rejecting write to ro segment %s\n", dev_info->dev.bus_id); | 605 | PRINT_WARN("rejecting write to ro segment %s\n", |
606 | dev_name(&dev_info->dev)); | ||
606 | goto fail; | 607 | goto fail; |
607 | } | 608 | } |
608 | } | 609 | } |