Skip to content

Commit

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

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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 11, 2011
1 parent a1ebfea commit 419f2d0
Showing 1 changed file with 19 additions and 20 deletions.
39 changes: 19 additions & 20 deletions drivers/staging/hv/storvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -830,25 +848,6 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,

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
*/
Expand Down

0 comments on commit 419f2d0

Please sign in to comment.