Skip to content

Commit

Permalink
Staging: hv: Get rid of the forward declaration of blkvsc_ioctl()
Browse files Browse the repository at this point in the history
Get rid of the forward declaration of blkvsc_ioctl() 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 b7be09c commit 7955344
Showing 1 changed file with 27 additions and 29 deletions.
56 changes: 27 additions & 29 deletions drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,15 +407,40 @@ static void blkvsc_init_rw(struct blkvsc_request *blkvsc_req)
}


static int blkvsc_ioctl(struct block_device *bd, fmode_t mode,
unsigned cmd, unsigned long argument)
{
/* struct block_device_context *blkdev = bd->bd_disk->private_data; */
int ret;

switch (cmd) {
/*
* TODO: I think there is certain format for HDIO_GET_IDENTITY rather
* than just a GUID. Commented it out for now.
*/
#if 0
case HDIO_GET_IDENTITY:
DPRINT_INFO(BLKVSC_DRV, "HDIO_GET_IDENTITY\n");
if (copy_to_user((void __user *)arg, blkdev->device_id,
blkdev->device_id_len))
ret = -EFAULT;
break;
#endif
default:
ret = -EINVAL;
break;
}

return ret;
}

/* Static decl */
static int blkvsc_probe(struct device *dev);
static int blkvsc_remove(struct device *device);
static void blkvsc_shutdown(struct device *device);

static int blkvsc_release(struct gendisk *disk, fmode_t mode);
static int blkvsc_revalidate_disk(struct gendisk *gd);
static int blkvsc_ioctl(struct block_device *bd, fmode_t mode,
unsigned cmd, unsigned long argument);
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 @@ -1499,33 +1524,6 @@ static int blkvsc_revalidate_disk(struct gendisk *gd)
return 0;
}

static int blkvsc_ioctl(struct block_device *bd, fmode_t mode,
unsigned cmd, unsigned long argument)
{
/* struct block_device_context *blkdev = bd->bd_disk->private_data; */
int ret;

switch (cmd) {
/*
* TODO: I think there is certain format for HDIO_GET_IDENTITY rather
* than just a GUID. Commented it out for now.
*/
#if 0
case HDIO_GET_IDENTITY:
DPRINT_INFO(BLKVSC_DRV, "HDIO_GET_IDENTITY\n");
if (copy_to_user((void __user *)arg, blkdev->device_id,
blkdev->device_id_len))
ret = -EFAULT;
break;
#endif
default:
ret = -EINVAL;
break;
}

return ret;
}

static int __init blkvsc_init(void)
{
int ret;
Expand Down

0 comments on commit 7955344

Please sign in to comment.