From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:54:50 +0000 (-0700) Subject: Staging: hv: storvsc_drv: Get rid of the indirection in invoking storvsc_do_io() X-Git-Tag: v3.0-rc1~336^2~370 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=636f0fd14ca29b29606f7c3292a5951b519ce14a;p=karo-tx-linux.git Staging: hv: storvsc_drv: Get rid of the indirection in invoking storvsc_do_io() Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 599b5d29552e..6300b7915bc7 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -596,8 +596,6 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd, struct hv_host_device *host_dev = (struct hv_host_device *)scmnd->device->host->hostdata; struct hv_device *dev = host_dev->dev; - struct storvsc_driver *storvsc_drv_obj = - drv_to_stordrv(dev->device.driver); struct hv_storvsc_request *request; struct storvsc_cmd_request *cmd_request; unsigned int request_size = 0; @@ -717,8 +715,8 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd, retry_request: /* Invokes the vsc to start an IO */ - ret = storvsc_drv_obj->on_io_request(dev, - &cmd_request->request); + ret = storvsc_do_io(dev, &cmd_request->request); + if (ret == -1) { /* no more space */