diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-12 11:02:03 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-18 18:34:20 -0500 |
commit | 1312f40e11c57edb5c3250f1b782cef8e3efea82 (patch) | |
tree | 0aae9e7fe6211d83212991e84789fcd7e9908ced /drivers/s390 | |
parent | 6f325a13442d4e4a6c93d06d8e6deff79b6540b1 (diff) |
[PATCH] regularize blk_cleanup_queue() use
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/block/dcssblk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 2e727f49ad19..44133250da2e 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
@@ -273,7 +273,7 @@ removeseg: | |||
273 | list_del(&dev_info->lh); | 273 | list_del(&dev_info->lh); |
274 | 274 | ||
275 | del_gendisk(dev_info->gd); | 275 | del_gendisk(dev_info->gd); |
276 | blk_put_queue(dev_info->dcssblk_queue); | 276 | blk_cleanup_queue(dev_info->dcssblk_queue); |
277 | dev_info->gd->queue = NULL; | 277 | dev_info->gd->queue = NULL; |
278 | put_disk(dev_info->gd); | 278 | put_disk(dev_info->gd); |
279 | device_unregister(dev); | 279 | device_unregister(dev); |
@@ -491,7 +491,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char | |||
491 | unregister_dev: | 491 | unregister_dev: |
492 | PRINT_ERR("device_create_file() failed!\n"); | 492 | PRINT_ERR("device_create_file() failed!\n"); |
493 | list_del(&dev_info->lh); | 493 | list_del(&dev_info->lh); |
494 | blk_put_queue(dev_info->dcssblk_queue); | 494 | blk_cleanup_queue(dev_info->dcssblk_queue); |
495 | dev_info->gd->queue = NULL; | 495 | dev_info->gd->queue = NULL; |
496 | put_disk(dev_info->gd); | 496 | put_disk(dev_info->gd); |
497 | device_unregister(&dev_info->dev); | 497 | device_unregister(&dev_info->dev); |
@@ -505,7 +505,7 @@ list_del: | |||
505 | unload_seg: | 505 | unload_seg: |
506 | segment_unload(local_buf); | 506 | segment_unload(local_buf); |
507 | dealloc_gendisk: | 507 | dealloc_gendisk: |
508 | blk_put_queue(dev_info->dcssblk_queue); | 508 | blk_cleanup_queue(dev_info->dcssblk_queue); |
509 | dev_info->gd->queue = NULL; | 509 | dev_info->gd->queue = NULL; |
510 | put_disk(dev_info->gd); | 510 | put_disk(dev_info->gd); |
511 | free_dev_info: | 511 | free_dev_info: |
@@ -562,7 +562,7 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch | |||
562 | list_del(&dev_info->lh); | 562 | list_del(&dev_info->lh); |
563 | 563 | ||
564 | del_gendisk(dev_info->gd); | 564 | del_gendisk(dev_info->gd); |
565 | blk_put_queue(dev_info->dcssblk_queue); | 565 | blk_cleanup_queue(dev_info->dcssblk_queue); |
566 | dev_info->gd->queue = NULL; | 566 | dev_info->gd->queue = NULL; |
567 | put_disk(dev_info->gd); | 567 | put_disk(dev_info->gd); |
568 | device_unregister(&dev_info->dev); | 568 | device_unregister(&dev_info->dev); |