diff options
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/loop.c | 4 | ||||
-rw-r--r-- | drivers/block/pktcdvd.c | 4 | ||||
-rw-r--r-- | drivers/block/umem.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 5f6d1a5cce11..0010704739e3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
@@ -1307,7 +1307,7 @@ static int __init loop_init(void) | |||
1307 | 1307 | ||
1308 | out_mem4: | 1308 | out_mem4: |
1309 | while (i--) | 1309 | while (i--) |
1310 | blk_put_queue(loop_dev[i].lo_queue); | 1310 | blk_cleanup_queue(loop_dev[i].lo_queue); |
1311 | devfs_remove("loop"); | 1311 | devfs_remove("loop"); |
1312 | i = max_loop; | 1312 | i = max_loop; |
1313 | out_mem3: | 1313 | out_mem3: |
@@ -1328,7 +1328,7 @@ static void loop_exit(void) | |||
1328 | 1328 | ||
1329 | for (i = 0; i < max_loop; i++) { | 1329 | for (i = 0; i < max_loop; i++) { |
1330 | del_gendisk(disks[i]); | 1330 | del_gendisk(disks[i]); |
1331 | blk_put_queue(loop_dev[i].lo_queue); | 1331 | blk_cleanup_queue(loop_dev[i].lo_queue); |
1332 | put_disk(disks[i]); | 1332 | put_disk(disks[i]); |
1333 | } | 1333 | } |
1334 | devfs_remove("loop"); | 1334 | devfs_remove("loop"); |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index bc9b2bcd7dba..476a5b553f34 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -2514,7 +2514,7 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd) | |||
2514 | return 0; | 2514 | return 0; |
2515 | 2515 | ||
2516 | out_new_dev: | 2516 | out_new_dev: |
2517 | blk_put_queue(disk->queue); | 2517 | blk_cleanup_queue(disk->queue); |
2518 | out_mem2: | 2518 | out_mem2: |
2519 | put_disk(disk); | 2519 | put_disk(disk); |
2520 | out_mem: | 2520 | out_mem: |
@@ -2555,7 +2555,7 @@ static int pkt_remove_dev(struct pkt_ctrl_command *ctrl_cmd) | |||
2555 | DPRINTK("pktcdvd: writer %s unmapped\n", pd->name); | 2555 | DPRINTK("pktcdvd: writer %s unmapped\n", pd->name); |
2556 | 2556 | ||
2557 | del_gendisk(pd->disk); | 2557 | del_gendisk(pd->disk); |
2558 | blk_put_queue(pd->disk->queue); | 2558 | blk_cleanup_queue(pd->disk->queue); |
2559 | put_disk(pd->disk); | 2559 | put_disk(pd->disk); |
2560 | 2560 | ||
2561 | pkt_devs[idx] = NULL; | 2561 | pkt_devs[idx] = NULL; |
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 4ada1268b40d..c16e66b9c7a7 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
@@ -1131,7 +1131,7 @@ static void mm_pci_remove(struct pci_dev *dev) | |||
1131 | pci_free_consistent(card->dev, PAGE_SIZE*2, | 1131 | pci_free_consistent(card->dev, PAGE_SIZE*2, |
1132 | card->mm_pages[1].desc, | 1132 | card->mm_pages[1].desc, |
1133 | card->mm_pages[1].page_dma); | 1133 | card->mm_pages[1].page_dma); |
1134 | blk_put_queue(card->queue); | 1134 | blk_cleanup_queue(card->queue); |
1135 | } | 1135 | } |
1136 | 1136 | ||
1137 | static const struct pci_device_id mm_pci_ids[] = { { | 1137 | static const struct pci_device_id mm_pci_ids[] = { { |