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

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 44dbaaef5321c73d83e18d33e132ab35452bfb00..4196d6ad0cd8e8d0d9b72b6a6caef56af19e9906 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -129,10 +129,28 @@ static int storvsc_merge_bvec(struct request_queue *q,
        return bvec->bv_len;
 }
 
+static int storvsc_device_configure(struct scsi_device *sdevice)
+{
+       scsi_adjust_queue_depth(sdevice, MSG_SIMPLE_TAG,
+                               STORVSC_MAX_IO_REQUESTS);
+
+       DPRINT_INFO(STORVSC_DRV, "sdev (%p) - setting max segment size to %ld",
+                   sdevice, PAGE_SIZE);
+       blk_queue_max_segment_size(sdevice->request_queue, PAGE_SIZE);
+
+       DPRINT_INFO(STORVSC_DRV, "sdev (%p) - adding merge bio vec routine",
+                   sdevice);
+       blk_queue_merge_bvec(sdevice->request_queue, storvsc_merge_bvec);
+
+       blk_queue_bounce_limit(sdevice->request_queue, BLK_BOUNCE_ANY);
+       /* sdevice->timeout = (2000 * HZ);//(75 * HZ); */
+
+       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_device_configure(struct scsi_device *);
 static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd);
 static int storvsc_remove(struct hv_device *dev);
 
@@ -830,25 +848,6 @@ retry_request:
 
 static DEF_SCSI_QCMD(storvsc_queuecommand)
 
-static int storvsc_device_configure(struct scsi_device *sdevice)
-{
-       scsi_adjust_queue_depth(sdevice, MSG_SIMPLE_TAG,
-                               STORVSC_MAX_IO_REQUESTS);
-
-       DPRINT_INFO(STORVSC_DRV, "sdev (%p) - setting max segment size to %ld",
-                   sdevice, PAGE_SIZE);
-       blk_queue_max_segment_size(sdevice->request_queue, PAGE_SIZE);
-
-       DPRINT_INFO(STORVSC_DRV, "sdev (%p) - adding merge bio vec routine",
-                   sdevice);
-       blk_queue_merge_bvec(sdevice->request_queue, storvsc_merge_bvec);
-
-       blk_queue_bounce_limit(sdevice->request_queue, BLK_BOUNCE_ANY);
-       /* sdevice->timeout = (2000 * HZ);//(75 * HZ); */
-
-       return 0;
-}
-
 /*
  * storvsc_host_reset_handler - Reset the scsi HBA
  */