Staging: hv: Get rid of the forward declaration of blkvsc_revalidate_disk()
authorK. Y. Srinivasan <kys@microsoft.com>
Fri, 22 Apr 2011 21:13:32 +0000 (14:13 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Apr 2011 23:20:46 +0000 (16:20 -0700)
Get rid of the forward declaration of blkvsc_revalidate_disk() 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>
drivers/staging/hv/blkvsc_drv.c

index 900ffc19f00bc64dfac1de90cd7e6abd18e99a2a..2094d00b7cb3b7f2625b3bfcd3e9dd50c30f8ea1 100644 (file)
@@ -853,9 +853,23 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev)
        return 0;
 }
 
+static int blkvsc_revalidate_disk(struct gendisk *gd)
+{
+       struct block_device_context *blkdev = gd->private_data;
+
+       DPRINT_DBG(BLKVSC_DRV, "- enter\n");
+
+       if (blkdev->device_type == DVD_TYPE) {
+               blkvsc_do_read_capacity(blkdev);
+               set_capacity(blkdev->gd, blkdev->capacity *
+                           (blkdev->sector_size/512));
+               blk_queue_logical_block_size(gd->queue, blkdev->sector_size);
+       }
+       return 0;
+}
+
 /* Static decl */
 static int blkvsc_probe(struct device *dev);
-static int blkvsc_revalidate_disk(struct gendisk *gd);
 static void blkvsc_request(struct request_queue *queue);
 static void blkvsc_request_completion(struct hv_storvsc_request *request);
 static int blkvsc_do_request(struct block_device_context *blkdev,
@@ -1504,21 +1518,6 @@ static void blkvsc_request(struct request_queue *queue)
        }
 }
 
-static int blkvsc_revalidate_disk(struct gendisk *gd)
-{
-       struct block_device_context *blkdev = gd->private_data;
-
-       DPRINT_DBG(BLKVSC_DRV, "- enter\n");
-
-       if (blkdev->device_type == DVD_TYPE) {
-               blkvsc_do_read_capacity(blkdev);
-               set_capacity(blkdev->gd, blkdev->capacity *
-                           (blkdev->sector_size/512));
-               blk_queue_logical_block_size(gd->queue, blkdev->sector_size);
-       }
-       return 0;
-}
-
 static int __init blkvsc_init(void)
 {
        int ret;