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

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

Staging: hv: Eliminate mousevsc_driver_context 



With the consolidation of all driver state into one data structure;
mousevsc_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 67a5ee2d

drivers/staging/hv/hv_mouse.c

+7 −14
Original line number Diff line number Diff line
@@ -777,11 +777,8 @@ struct input_device_context { 
	int			connected;

};



struct mousevsc_driver_context {

	struct mousevsc_drv_obj	drv_obj;

};



static struct mousevsc_driver_context g_mousevsc_drv;

static struct  mousevsc_drv_obj g_mousevsc_drv;



static void deviceinfo_callback(struct hv_device *dev, struct hv_input_dev_info *info)

{
@@ -824,9 +821,7 @@ static int mousevsc_probe(struct device *device) 


	struct hv_driver *drv =

		drv_to_hv_drv(device->driver);

	struct mousevsc_driver_context *mousevsc_drv_ctx =

		(struct mousevsc_driver_context *)drv->priv;

	struct mousevsc_drv_obj *mousevsc_drv_obj = &mousevsc_drv_ctx->drv_obj;

	struct mousevsc_drv_obj *mousevsc_drv_obj = drv->priv;



	struct vm_device *device_ctx = device_to_vm_device(device);

	struct hv_device *device_obj = &device_ctx->device_obj;
@@ -855,9 +850,7 @@ static int mousevsc_remove(struct device *device) 


	struct hv_driver *drv =

		drv_to_hv_drv(device->driver);

	struct mousevsc_driver_context *mousevsc_drv_ctx =

		(struct mousevsc_driver_context *)drv->priv;

	struct mousevsc_drv_obj *mousevsc_drv_obj = &mousevsc_drv_ctx->drv_obj;

	struct mousevsc_drv_obj *mousevsc_drv_obj = drv->priv;



	struct vm_device *device_ctx = device_to_vm_device(device);

	struct hv_device *device_obj = &device_ctx->device_obj;
@@ -956,8 +949,8 @@ static int mousevsc_drv_exit_cb(struct device *dev, void *data) 


static void mousevsc_drv_exit(void)

{

	struct mousevsc_drv_obj *mousevsc_drv_obj = &g_mousevsc_drv.drv_obj;

	struct hv_driver *drv = &g_mousevsc_drv.drv_obj.Base;

	struct mousevsc_drv_obj *mousevsc_drv_obj = &g_mousevsc_drv;

	struct hv_driver *drv = &g_mousevsc_drv.Base;

	int ret;



	struct device *current_dev = NULL;
@@ -1008,8 +1001,8 @@ static int mouse_vsc_initialize(struct hv_driver *Driver) 


static int __init mousevsc_init(void)

{

	struct mousevsc_drv_obj *input_drv_obj = &g_mousevsc_drv.drv_obj;

	struct hv_driver *drv = &g_mousevsc_drv.drv_obj.Base;

	struct mousevsc_drv_obj *input_drv_obj = &g_mousevsc_drv;

	struct hv_driver *drv = &g_mousevsc_drv.Base;



	DPRINT_INFO(INPUTVSC_DRV, "Hyper-V Mouse driver initializing.");