diff options
| author | K. Y. Srinivasan | 2011-05-10 16:54:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-05-11 22:48:38 +0200 |
| commit | 96e690be736ed348b6765dec14f4104d9ad71d96 (patch) | |
| tree | 9dacb19c05331b79d08a9530654a6def728e3a56 | |
| parent | Staging: hv: Move the definition of storvsc_host_reset() to earlier in the file (diff) | |
| download | kernel-qcow2-linux-96e690be736ed348b6765dec14f4104d9ad71d96.tar.gz kernel-qcow2-linux-96e690be736ed348b6765dec14f4104d9ad71d96.tar.xz kernel-qcow2-linux-96e690be736ed348b6765dec14f4104d9ad71d96.zip | |
Staging: hv: Get rid of the forward declaration for storvsc_host_reset_handler()
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>
| -rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 3b2917e8e490..462aaa527111 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -511,10 +511,33 @@ cleanup: } +/* + * storvsc_host_reset_handler - Reset the scsi HBA + */ +static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) +{ + int ret; + struct hv_host_device *host_dev = + (struct hv_host_device *)scmnd->device->host->hostdata; + struct hv_device *dev = host_dev->dev; + + DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...", + scmnd->device, dev); + + /* Invokes the vsc to reset the host/bus */ + ret = storvsc_host_reset(dev); + if (ret != 0) + return ret; + + DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted", + scmnd->device, dev); + + return ret; +} + /* 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_host_reset_handler(struct scsi_cmnd *scmnd); static int storvsc_ringbuffer_size = STORVSC_RING_BUFFER_SIZE; module_param(storvsc_ringbuffer_size, int, S_IRUGO); @@ -920,30 +943,6 @@ retry_request: static DEF_SCSI_QCMD(storvsc_queuecommand) -/* - * storvsc_host_reset_handler - Reset the scsi HBA - */ -static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) -{ - int ret; - struct hv_host_device *host_dev = - (struct hv_host_device *)scmnd->device->host->hostdata; - struct hv_device *dev = host_dev->dev; - - DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...", - scmnd->device, dev); - - /* Invokes the vsc to reset the host/bus */ - ret = storvsc_host_reset(dev); - if (ret != 0) - return ret; - - DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted", - scmnd->device, dev); - - return ret; -} - static int __init storvsc_init(void) { int ret; |