|
@@ -4053,26 +4053,24 @@ static int mtip_block_remove(struct driver_data *dd)
|
|
|
*/
|
|
|
static int mtip_block_shutdown(struct driver_data *dd)
|
|
|
{
|
|
|
- dev_info(&dd->pdev->dev,
|
|
|
- "Shutting down %s ...\n", dd->disk->disk_name);
|
|
|
-
|
|
|
/* Delete our gendisk structure, and cleanup the blk queue. */
|
|
|
if (dd->disk) {
|
|
|
- if (dd->disk->queue)
|
|
|
+ dev_info(&dd->pdev->dev,
|
|
|
+ "Shutting down %s ...\n", dd->disk->disk_name);
|
|
|
+
|
|
|
+ if (dd->disk->queue) {
|
|
|
del_gendisk(dd->disk);
|
|
|
- else
|
|
|
+ blk_cleanup_queue(dd->queue);
|
|
|
+ } else
|
|
|
put_disk(dd->disk);
|
|
|
+ dd->disk = NULL;
|
|
|
+ dd->queue = NULL;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
spin_lock(&rssd_index_lock);
|
|
|
ida_remove(&rssd_index_ida, dd->index);
|
|
|
spin_unlock(&rssd_index_lock);
|
|
|
|
|
|
- blk_cleanup_queue(dd->queue);
|
|
|
- dd->disk = NULL;
|
|
|
- dd->queue = NULL;
|
|
|
-
|
|
|
mtip_hw_shutdown(dd);
|
|
|
return 0;
|
|
|
}
|