diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-25 16:41:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-25 16:41:06 -0700 |
| commit | 3f4636e625204e74986e9f1f845229ebd6235f9e (patch) | |
| tree | 7f3e773dd6270172084c568a1cebb791a6ad0f84 /drivers/staging/hv/hv_mouse.c | |
| parent | 4bc694057bc95049ed8d451c2e142c79bbf97328 (diff) | |
| download | op-kernel-dev-3f4636e625204e74986e9f1f845229ebd6235f9e.zip op-kernel-dev-3f4636e625204e74986e9f1f845229ebd6235f9e.tar.gz | |
Staging: hv: hv_mouse: remove inputreport_callback function
It's not needed, so just inline the two lines.
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/hv_mouse.c')
| -rw-r--r-- | drivers/staging/hv/hv_mouse.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index 8c4ae37..257684e 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/drivers/staging/hv/hv_mouse.c @@ -180,7 +180,6 @@ struct input_device_context { int connected; }; -static void inputreport_callback(struct hv_device *dev, void *packet, u32 len); static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len); static struct mousevsc_dev *alloc_input_device(struct hv_device *device) @@ -403,6 +402,7 @@ static void mousevsc_on_receive_input_report(struct mousevsc_dev *input_device, struct synthhid_input_report *input_report) { struct hv_driver *input_drv; + struct input_device_context *input_dev_ctx; if (!input_device->init_complete) { pr_info("Initialization incomplete...ignoring input_report msg"); @@ -411,9 +411,11 @@ static void mousevsc_on_receive_input_report(struct mousevsc_dev *input_device, input_drv = drv_to_hv_drv(input_device->device->device.driver); - inputreport_callback(input_device->device, - input_report->buffer, - input_report->header.size); + input_dev_ctx = dev_get_drvdata(&input_device->device->device); + + hid_input_report(input_dev_ctx->hid_device, + HID_INPUT_REPORT, input_report->buffer, input_report->header.size, 1); + } static void mousevsc_on_receive(struct hv_device *device, @@ -760,19 +762,6 @@ static int mousevsc_on_device_remove(struct hv_device *device) } -static void inputreport_callback(struct hv_device *dev, void *packet, u32 len) -{ - int ret = 0; - - struct input_device_context *input_dev_ctx = - dev_get_drvdata(&dev->device); - - ret = hid_input_report(input_dev_ctx->hid_device, - HID_INPUT_REPORT, packet, len, 1); - - DPRINT_DBG(INPUTVSC_DRV, "hid_input_report (ret %d)", ret); -} - static int mousevsc_hid_open(struct hid_device *hid) { return 0; |
