Staging: hv: Get rid of the forward declaration of storvsc_remove()

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 807ba891c020e6d5a231141638adcca46b34fb4a..6f23f52130af6c3ef89ffa2939526cb2a5b1351c 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -350,11 +350,41 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,
        return total_copied;
 }
 
+
+/*
+ * storvsc_remove - Callback when our device is removed
+ */
+static int storvsc_remove(struct hv_device *dev)
+{
+       struct storvsc_driver *storvsc_drv_obj =
+                        drv_to_stordrv(dev->device.driver);
+       struct Scsi_Host *host = dev_get_drvdata(&dev->device);
+       struct hv_host_device *host_dev =
+                       (struct hv_host_device *)host->hostdata;
+
+       /*
+        * Call to the vsc driver to let it know that the device is being
+        * removed
+        */
+       storvsc_drv_obj->base.dev_rm(dev);
+
+       if (host_dev->request_pool) {
+               kmem_cache_destroy(host_dev->request_pool);
+               host_dev->request_pool = NULL;
+       }
+
+       DPRINT_INFO(STORVSC, "removing host adapter (%p)...", host);
+       scsi_remove_host(host);
+
+       DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host);
+       scsi_host_put(host);
+       return 0;
+}
+
 /* 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_remove(struct hv_device *dev);
 
 static int storvsc_get_chs(struct scsi_device *sdev, struct block_device *bdev,
                           sector_t capacity, int *info);
@@ -588,36 +618,6 @@ static int storvsc_probe(struct hv_device *device)
        return ret;
 }
 
-/*
- * storvsc_remove - Callback when our device is removed
- */
-static int storvsc_remove(struct hv_device *dev)
-{
-       struct storvsc_driver *storvsc_drv_obj =
-                        drv_to_stordrv(dev->device.driver);
-       struct Scsi_Host *host = dev_get_drvdata(&dev->device);
-       struct hv_host_device *host_dev =
-                       (struct hv_host_device *)host->hostdata;
-
-       /*
-        * Call to the vsc driver to let it know that the device is being
-        * removed
-        */
-       storvsc_drv_obj->base.dev_rm(dev);
-
-       if (host_dev->request_pool) {
-               kmem_cache_destroy(host_dev->request_pool);
-               host_dev->request_pool = NULL;
-       }
-
-       DPRINT_INFO(STORVSC, "removing host adapter (%p)...", host);
-       scsi_remove_host(host);
-
-       DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host);
-       scsi_host_put(host);
-       return 0;
-}
-
 /*
  * storvsc_commmand_completion - Command completion processing
  */