diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-04-29 13:45:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-03 13:31:30 -0700 |
| commit | 415b023ab8d6dfb88f106163a7f202a8665fb20a (patch) | |
| tree | de057e25837ee048df80b51eda185b618cdf46ef /drivers/staging/hv/blkvsc_drv.c | |
| parent | 63e69e01d7de3ce49d4312e8d78e43a5efe2f737 (diff) | |
| download | kernel_samsung_smdk4412-415b023ab8d6dfb88f106163a7f202a8665fb20a.zip kernel_samsung_smdk4412-415b023ab8d6dfb88f106163a7f202a8665fb20a.tar.gz kernel_samsung_smdk4412-415b023ab8d6dfb88f106163a7f202a8665fb20a.tar.bz2 | |
Staging: hv: Use the remove() function in struct hv_driver
Use the newly introduced remove() function in struct hv_driver.
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>
Diffstat (limited to 'drivers/staging/hv/blkvsc_drv.c')
| -rw-r--r-- | drivers/staging/hv/blkvsc_drv.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 20b9a53..80f7c0e 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -537,19 +537,18 @@ out: /* * blkvsc_remove() - Callback when our device is removed */ -static int blkvsc_remove(struct device *device) +static int blkvsc_remove(struct hv_device *dev) { struct storvsc_driver_object *storvsc_drv_obj = - drv_to_stordrv(device->driver); - struct hv_device *device_obj = device_to_hv_device(device); - struct block_device_context *blkdev = dev_get_drvdata(device); + drv_to_stordrv(dev->device.driver); + struct block_device_context *blkdev = dev_get_drvdata(&dev->device); unsigned long flags; /* * Call to the vsc driver to let it know that the device is being * removed */ - storvsc_drv_obj->base.dev_rm(device_obj); + storvsc_drv_obj->base.dev_rm(dev); /* Get to a known state */ spin_lock_irqsave(&blkdev->lock, flags); @@ -883,7 +882,7 @@ static int blkvsc_drv_init(void) drv->driver.name = storvsc_drv_obj->base.name; drv->probe = blkvsc_probe; - drv->driver.remove = blkvsc_remove; + drv->remove = blkvsc_remove; drv->driver.shutdown = blkvsc_shutdown; /* The driver belongs to vmbus */ |