leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: hv: Eliminate mousevsc_driver_context

Browse Source 
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: 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>
This commit is contained in:
K. Y. Srinivasan 2011-03-07 14:16:46 -08:00 committed by Greg Kroah-Hartman
parent 67a5ee2d5e
commit 680eeb15c0
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/hv/hv_mouse.c
View File

@ -777,11 +777,8 @@ struct input_device_context {
int connected; 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) 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 = struct hv_driver *drv =
drv_to_hv_drv(device->driver); drv_to_hv_drv(device->driver);
struct mousevsc_driver_context *mousevsc_drv_ctx = struct mousevsc_drv_obj *mousevsc_drv_obj = drv->priv;
(struct mousevsc_driver_context *)drv->priv;
struct mousevsc_drv_obj *mousevsc_drv_obj = &mousevsc_drv_ctx->drv_obj;
struct vm_device *device_ctx = device_to_vm_device(device); struct vm_device *device_ctx = device_to_vm_device(device);
struct hv_device *device_obj = &device_ctx->device_obj; struct hv_device *device_obj = &device_ctx->device_obj;
@ -855,9 +850,7 @@ static int mousevsc_remove(struct device *device)
struct hv_driver *drv = struct hv_driver *drv =
drv_to_hv_drv(device->driver); drv_to_hv_drv(device->driver);
struct mousevsc_driver_context *mousevsc_drv_ctx = struct mousevsc_drv_obj *mousevsc_drv_obj = drv->priv;
(struct mousevsc_driver_context *)drv->priv;
struct mousevsc_drv_obj *mousevsc_drv_obj = &mousevsc_drv_ctx->drv_obj;
struct vm_device *device_ctx = device_to_vm_device(device); struct vm_device *device_ctx = device_to_vm_device(device);
struct hv_device *device_obj = &device_ctx->device_obj; 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) static void mousevsc_drv_exit(void)
{ {
struct mousevsc_drv_obj *mousevsc_drv_obj = &g_mousevsc_drv.drv_obj; struct mousevsc_drv_obj *mousevsc_drv_obj = &g_mousevsc_drv;
struct hv_driver *drv = &g_mousevsc_drv.drv_obj.Base; struct hv_driver *drv = &g_mousevsc_drv.Base;
int ret; int ret;
struct device *current_dev = NULL; struct device *current_dev = NULL;
@ -1008,8 +1001,8 @@ static int mouse_vsc_initialize(struct hv_driver *Driver)
static int __init mousevsc_init(void) static int __init mousevsc_init(void)
{ {
struct mousevsc_drv_obj *input_drv_obj = &g_mousevsc_drv.drv_obj; struct mousevsc_drv_obj *input_drv_obj = &g_mousevsc_drv;
struct hv_driver *drv = &g_mousevsc_drv.drv_obj.Base; struct hv_driver *drv = &g_mousevsc_drv.Base;
DPRINT_INFO(INPUTVSC_DRV, "Hyper-V Mouse driver initializing."); DPRINT_INFO(INPUTVSC_DRV, "Hyper-V Mouse driver initializing.");