Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4af27d70 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: Eliminate storvsc_driver_context structure 



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

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d8de5dc6

drivers/staging/hv/storvsc_drv.c

+8 −20
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ struct storvsc_cmd_request { 
	 * Which sounds like a very bad design... */

};



struct storvsc_driver_context {

	struct storvsc_driver_object drv_obj;

};



/* Static decl */

static int storvsc_probe(struct device *dev);
@@ -97,7 +94,7 @@ module_param(storvsc_ringbuffer_size, int, S_IRUGO); 
MODULE_PARM_DESC(storvsc_ringbuffer_size, "Ring buffer size (bytes)");



/* The one and only one */

static struct storvsc_driver_context g_storvsc_drv;

static struct storvsc_driver_object g_storvsc_drv;



/* Scsi driver */

static struct scsi_host_template scsi_driver = {
@@ -134,8 +131,8 @@ static struct scsi_host_template scsi_driver = { 
static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))

{

	int ret;

	struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj;

	struct hv_driver *drv = &g_storvsc_drv.drv_obj.base;

	struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv;

	struct hv_driver *drv = &g_storvsc_drv.base;



	storvsc_drv_obj->ring_buffer_size = storvsc_ringbuffer_size;
@@ -179,8 +176,8 @@ static int storvsc_drv_exit_cb(struct device *dev, void *data) 


static void storvsc_drv_exit(void)

{

	struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj;

	struct hv_driver *drv = &g_storvsc_drv.drv_obj.base;

	struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv;

	struct hv_driver *drv = &g_storvsc_drv.base;

	struct device *current_dev = NULL;

	int ret;
@@ -218,10 +215,7 @@ static int storvsc_probe(struct device *device) 
	int ret;

	struct hv_driver *drv =

				drv_to_hv_drv(device->driver);

	struct storvsc_driver_context *storvsc_drv_ctx =

				(struct storvsc_driver_context *)drv->priv;

	struct storvsc_driver_object *storvsc_drv_obj =

				&storvsc_drv_ctx->drv_obj;

	struct storvsc_driver_object *storvsc_drv_obj = drv->priv;

	struct vm_device *device_ctx = device_to_vm_device(device);

	struct hv_device *device_obj = &device_ctx->device_obj;

	struct Scsi_Host *host;
@@ -303,10 +297,7 @@ static int storvsc_remove(struct device *device) 
	int ret;

	struct hv_driver *drv =

			drv_to_hv_drv(device->driver);

	struct storvsc_driver_context *storvsc_drv_ctx =

			(struct storvsc_driver_context *)drv->priv;

	struct storvsc_driver_object *storvsc_drv_obj =

			&storvsc_drv_ctx->drv_obj;

	struct storvsc_driver_object *storvsc_drv_obj = drv->priv;

	struct vm_device *device_ctx = device_to_vm_device(device);

	struct hv_device *device_obj = &device_ctx->device_obj;

	struct Scsi_Host *host = dev_get_drvdata(device);
@@ -601,10 +592,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd, 
	struct vm_device *device_ctx = host_device_ctx->device_ctx;

	struct hv_driver *drv =

		drv_to_hv_drv(device_ctx->device.driver);

	struct storvsc_driver_context *storvsc_drv_ctx =

		(struct storvsc_driver_context *)drv->priv;

	struct storvsc_driver_object *storvsc_drv_obj =

		&storvsc_drv_ctx->drv_obj;

	struct storvsc_driver_object *storvsc_drv_obj = drv->priv;

	struct hv_storvsc_request *request;

	struct storvsc_cmd_request *cmd_request;

	unsigned int request_size = 0;