Staging: hv: Eliminate blkvsc_driver_context structure

With the consolidation of all driver state into one data structure;
blkvsc_driver_context structure is not needed; get rid of it.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index af0a529..0f9fb05 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -115,10 +115,6 @@ struct block_device_context {
        int users;
 };
 
-/* Per driver */
-struct blkvsc_driver_context {
-       struct storvsc_driver_object drv_obj;
-};
 
 /* Static decl */
 static DEFINE_MUTEX(blkvsc_mutex);
@@ -153,7 +149,7 @@ module_param(blkvsc_ringbuffer_size, int, S_IRUGO);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (in bytes)");
 
 /* The one and only one */
-static struct blkvsc_driver_context g_blkvsc_drv;
+static  struct storvsc_driver_object g_blkvsc_drv;
 
 static const struct block_device_operations block_ops = {
        .owner = THIS_MODULE,
@@ -170,8 +166,8 @@ static const struct block_device_operations block_ops = {
  */
 static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
 {
-       struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv.drv_obj;
-       struct hv_driver *drv = &g_blkvsc_drv.drv_obj.base;
+       struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv;
+       struct hv_driver *drv = &g_blkvsc_drv.base;
        int ret;
 
        storvsc_drv_obj->ring_buffer_size = blkvsc_ringbuffer_size;
@@ -202,8 +198,8 @@ static int blkvsc_drv_exit_cb(struct device *dev, void *data)
 
 static void blkvsc_drv_exit(void)
 {
-       struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv.drv_obj;
-       struct hv_driver *drv = &g_blkvsc_drv.drv_obj.base;
+       struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv;
+       struct hv_driver *drv = &g_blkvsc_drv.base;
        struct device *current_dev;
        int ret;
 
@@ -242,10 +238,8 @@ static int blkvsc_probe(struct device *device)
 {
        struct hv_driver *drv =
                                drv_to_hv_drv(device->driver);
-       struct blkvsc_driver_context *blkvsc_drv_ctx =
-                               (struct blkvsc_driver_context *)drv->priv;
        struct storvsc_driver_object *storvsc_drv_obj =
-                               &blkvsc_drv_ctx->drv_obj;
+                               drv->priv;
        struct vm_device *device_ctx = device_to_vm_device(device);
        struct hv_device *device_obj = &device_ctx->device_obj;
 
@@ -727,10 +721,8 @@ static int blkvsc_remove(struct device *device)
 {
        struct hv_driver *drv =
                                drv_to_hv_drv(device->driver);
-       struct blkvsc_driver_context *blkvsc_drv_ctx =
-                               (struct blkvsc_driver_context *)drv->priv;
        struct storvsc_driver_object *storvsc_drv_obj =
-                               &blkvsc_drv_ctx->drv_obj;
+                               drv->priv;
        struct vm_device *device_ctx = device_to_vm_device(device);
        struct hv_device *device_obj = &device_ctx->device_obj;
        struct block_device_context *blkdev = dev_get_drvdata(device);
@@ -850,10 +842,8 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
        struct vm_device *device_ctx = blkdev->device_ctx;
        struct hv_driver *drv =
                        drv_to_hv_drv(device_ctx->device.driver);
-       struct blkvsc_driver_context *blkvsc_drv_ctx =
-                       (struct blkvsc_driver_context *)drv->priv;
        struct storvsc_driver_object *storvsc_drv_obj =
-                       &blkvsc_drv_ctx->drv_obj;
+                       drv->priv;
        struct hv_storvsc_request *storvsc_req;
        int ret;