Skip to content

Commit

Permalink
Staging: hv: Get rid of the forward declaration of blkvsc_revalidate_…
Browse files Browse the repository at this point in the history
…disk()

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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 25, 2011
1 parent 583c367 commit 349b38e
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 349b38e

Please sign in to comment.