52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From: "K. Y. Srinivasan" <kys@microsoft.com>
|
|
Date: Thu, 12 Jan 2012 12:37:58 -0800
|
|
Subject: [PATCH 52/77] Staging: hv: storvsc: Cleanup
|
|
storvsc_host_reset_handler()
|
|
|
|
commit 4b270c8b23722128adedb5694097aea367284ce1 upstream.
|
|
|
|
Cleanup storvsc_host_reset_handler() by getting rid of storvsc_host_reset().
|
|
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/hv/storvsc_drv.c | 14 ++++----------
|
|
1 file changed, 4 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
|
|
index 979f25b..8340387 100644
|
|
--- a/drivers/staging/hv/storvsc_drv.c
|
|
+++ b/drivers/staging/hv/storvsc_drv.c
|
|
@@ -1122,8 +1122,11 @@ static int storvsc_get_chs(struct scsi_device *sdev, struct block_device * bdev,
|
|
return 0;
|
|
}
|
|
|
|
-static int storvsc_host_reset(struct hv_device *device)
|
|
+static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
|
|
{
|
|
+ struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
|
|
+ struct hv_device *device = host_dev->dev;
|
|
+
|
|
struct storvsc_device *stor_device;
|
|
struct hv_storvsc_request *request;
|
|
struct vstor_packet *vstor_packet;
|
|
@@ -1165,15 +1168,6 @@ static int storvsc_host_reset(struct hv_device *device)
|
|
}
|
|
|
|
|
|
-static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
|
|
-{
|
|
- struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
|
|
- struct hv_device *dev = host_dev->dev;
|
|
-
|
|
- return storvsc_host_reset(dev);
|
|
-}
|
|
-
|
|
-
|
|
static void storvsc_command_completion(struct hv_storvsc_request *request)
|
|
{
|
|
struct storvsc_cmd_request *cmd_request =
|
|
--
|
|
1.7.9.5
|
|
|