Staging: hv: Get rid of the forward declaration for storvsc_host_reset_handler()

Get rid of the forward declaration by moving the code around.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 3b2917e8e490d05e6320f17c9dc208d52e99fdf0..462aaa527111f52eecca43a1ce996c4f62a58d94 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -511,10 +511,33 @@ cleanup:
 }
 
 
+/*
+ * storvsc_host_reset_handler - Reset the scsi HBA
+ */
+static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
+{
+       int ret;
+       struct hv_host_device *host_dev =
+               (struct hv_host_device *)scmnd->device->host->hostdata;
+       struct hv_device *dev = host_dev->dev;
+
+       DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...",
+                   scmnd->device, dev);
+
+       /* Invokes the vsc to reset the host/bus */
+       ret = storvsc_host_reset(dev);
+       if (ret != 0)
+               return ret;
+
+       DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted",
+                   scmnd->device, dev);
+
+       return ret;
+}
+
 /* Static decl */
 static int storvsc_probe(struct hv_device *dev);
 static int storvsc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd);
-static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd);
 
 static int storvsc_ringbuffer_size = STORVSC_RING_BUFFER_SIZE;
 module_param(storvsc_ringbuffer_size, int, S_IRUGO);
@@ -920,30 +943,6 @@ retry_request:
 
 static DEF_SCSI_QCMD(storvsc_queuecommand)
 
-/*
- * storvsc_host_reset_handler - Reset the scsi HBA
- */
-static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
-{
-       int ret;
-       struct hv_host_device *host_dev =
-               (struct hv_host_device *)scmnd->device->host->hostdata;
-       struct hv_device *dev = host_dev->dev;
-
-       DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...",
-                   scmnd->device, dev);
-
-       /* Invokes the vsc to reset the host/bus */
-       ret = storvsc_host_reset(dev);
-       if (ret != 0)
-               return ret;
-
-       DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted",
-                   scmnd->device, dev);
-
-       return ret;
-}
-
 static int __init storvsc_init(void)
 {
        int ret;