66 lines
1.7 KiB
Diff
66 lines
1.7 KiB
Diff
From: "K. Y. Srinivasan" <kys@microsoft.com>
|
|
Date: Thu, 12 Jan 2012 12:37:59 -0800
|
|
Subject: [PATCH 53/77] Staging: hv: storvsc: Move and cleanup
|
|
storvsc_remove()
|
|
|
|
commit ddcbf65e484c3473d3e808718ddb6c8166822c4c upstream.
|
|
|
|
Relocate the storvsc_remove() function to a different location in the file
|
|
and invoke scsi_host_put() only after all the cleanup.
|
|
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/hv/storvsc_drv.c | 28 ++++++++++++----------------
|
|
1 file changed, 12 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
|
|
index 8340387..e0e471c 100644
|
|
--- a/drivers/staging/hv/storvsc_drv.c
|
|
+++ b/drivers/staging/hv/storvsc_drv.c
|
|
@@ -1083,22 +1083,6 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,
|
|
return total_copied;
|
|
}
|
|
|
|
-
|
|
-static int storvsc_remove(struct hv_device *dev)
|
|
-{
|
|
- struct storvsc_device *stor_device = hv_get_drvdata(dev);
|
|
- struct Scsi_Host *host = stor_device->host;
|
|
-
|
|
- scsi_remove_host(host);
|
|
-
|
|
- scsi_host_put(host);
|
|
-
|
|
- storvsc_dev_remove(dev);
|
|
-
|
|
- return 0;
|
|
-}
|
|
-
|
|
-
|
|
static int storvsc_get_chs(struct scsi_device *sdev, struct block_device * bdev,
|
|
sector_t capacity, int *info)
|
|
{
|
|
@@ -1526,6 +1510,18 @@ err_out0:
|
|
return ret;
|
|
}
|
|
|
|
+static int storvsc_remove(struct hv_device *dev)
|
|
+{
|
|
+ struct storvsc_device *stor_device = hv_get_drvdata(dev);
|
|
+ struct Scsi_Host *host = stor_device->host;
|
|
+
|
|
+ scsi_remove_host(host);
|
|
+ storvsc_dev_remove(dev);
|
|
+ scsi_host_put(host);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static struct hv_driver storvsc_drv = {
|
|
.name = KBUILD_MODNAME,
|
|
.id_table = id_table,
|
|
--
|
|
1.7.9.5
|
|
|