Commit 349b38e8 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

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



Get rid of the forward declaration of blkvsc_revalidate_disk() by moving
the code around.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 583c367f

drivers/staging/hv/blkvsc_drv.c

+15 −16
Original line number Diff line number Diff line
@@ -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;