From b7e48f11c86c2f2624ab5eef39d54dae9b2e9e31 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 Jan 2012 12:37:59 -0800 Subject: [PATCH] --- yaml --- r: 288937 b: refs/heads/master c: ddcbf65e484c3473d3e808718ddb6c8166822c4c h: refs/heads/master i: 288935: 85d77497cf892e8ee762858f29d34fdbf85e4db9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/storvsc_drv.c | 28 +++++++++++--------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 37b439aa5544..f3aa319ae371 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b270c8b23722128adedb5694097aea367284ce1 +refs/heads/master: ddcbf65e484c3473d3e808718ddb6c8166822c4c diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c index 8340387b3781..e0e471cedcae 100644 --- a/trunk/drivers/staging/hv/storvsc_drv.c +++ b/trunk/drivers/staging/hv/storvsc_drv.c @@ -1083,22 +1083,6 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl, return total_copied; } - -static int storvsc_remove(struct hv_device *dev) -{ - struct storvsc_device *stor_device = hv_get_drvdata(dev); - struct Scsi_Host *host = stor_device->host; - - scsi_remove_host(host); - - scsi_host_put(host); - - storvsc_dev_remove(dev); - - return 0; -} - - static int storvsc_get_chs(struct scsi_device *sdev, struct block_device * bdev, sector_t capacity, int *info) { @@ -1526,6 +1510,18 @@ static int storvsc_probe(struct hv_device *device, return ret; } +static int storvsc_remove(struct hv_device *dev) +{ + struct storvsc_device *stor_device = hv_get_drvdata(dev); + struct Scsi_Host *host = stor_device->host; + + scsi_remove_host(host); + storvsc_dev_remove(dev); + scsi_host_put(host); + + return 0; +} + static struct hv_driver storvsc_drv = { .name = KBUILD_MODNAME, .id_table = id_table,