aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK. Y. Srinivasan <[email protected]>2011-05-10 07:54:48 -0700
committerGreg Kroah-Hartman <[email protected]>2011-05-11 13:48:42 -0700
commit6cdc57c0aaac398938a3b127d74a848988fcf9c7 (patch)
tree79820f526f5672856e4b3e26ce3a1ffc2f0786bf
parent9b3e773b3e9bce8509ae9d893bed478a009b473a (diff)
Staging: hv: storvsc_drv: Get rid of the indirection in invoking storvsc_dev_remove()
Get rid of the indirection in invoking storvsc_dev_remove() Signed-off-by: K. Y. Srinivasan <[email protected]> Signed-off-by: Haiyang Zhang <[email protected]> Signed-off-by: Abhishek Kane <[email protected]> Signed-off-by: Hank Janssen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/hv/storvsc_drv.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 650e11fe8cba..233aa4c56e95 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -359,8 +359,6 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,
*/
static int storvsc_remove(struct hv_device *dev)
{
- struct storvsc_driver *storvsc_drv_obj =
- drv_to_stordrv(dev->device.driver);
struct Scsi_Host *host = dev_get_drvdata(&dev->device);
struct hv_host_device *host_dev =
(struct hv_host_device *)host->hostdata;
@@ -369,7 +367,7 @@ static int storvsc_remove(struct hv_device *dev)
* Call to the vsc driver to let it know that the device is being
* removed
*/
- storvsc_drv_obj->base.dev_rm(dev);
+ storvsc_dev_remove(dev);
if (host_dev->request_pool) {
kmem_cache_destroy(host_dev->request_pool);
@@ -842,7 +840,7 @@ static int storvsc_probe(struct hv_device *device)
ret = scsi_add_host(host, &device->device);
if (ret != 0) {
- storvsc_drv_obj->base.dev_rm(device);
+ storvsc_dev_remove(device);
kmem_cache_destroy(host_dev->request_pool);
scsi_host_put(host);