Staging: hv: hv_mouse: remove a forward declaration
[pandora-kernel.git] / drivers / staging / hv / hv_mouse.c
index d957fc2..083f28f 100644 (file)
@@ -22,8 +22,6 @@
 #include <linux/input.h>
 #include <linux/hid.h>
 #include <linux/hiddev.h>
-#include <linux/pci.h>
-#include <linux/dmi.h>
 
 #include "hyperv.h"
 
@@ -54,7 +52,7 @@ struct hv_input_dev_info {
                                         (SYNTHHID_INPUT_VERSION_MAJOR << 16))
 
 
-#pragma pack(push,1)
+#pragma pack(push, 1)
 /*
  * Message types in the synthetic input protocol
  */
@@ -120,8 +118,8 @@ struct synthhid_input_report {
 
 #pragma pack(pop)
 
-#define INPUTVSC_SEND_RING_BUFFER_SIZE         10*PAGE_SIZE
-#define INPUTVSC_RECV_RING_BUFFER_SIZE         10*PAGE_SIZE
+#define INPUTVSC_SEND_RING_BUFFER_SIZE         (10*PAGE_SIZE)
+#define INPUTVSC_RECV_RING_BUFFER_SIZE         (10*PAGE_SIZE)
 
 #define NBITS(x) (((x)/BITS_PER_LONG)+1)
 
@@ -175,19 +173,13 @@ struct mousevsc_dev {
        struct hv_input_dev_info hid_dev_info;
 };
 
-
-static const char *driver_name = "mousevsc";
-
-/* {CFA8B69E-5B4A-4cc0-B98B-8BA1A1F3F95A} */
-static const struct hv_guid mouse_guid = {
-       .data = {0x9E, 0xB6, 0xA8, 0xCF, 0x4A, 0x5B, 0xc0, 0x4c,
-                0xB9, 0x8B, 0x8B, 0xA1, 0xA1, 0xF3, 0xF9, 0x5A}
+struct input_device_context {
+       struct hv_device        *device_ctx;
+       struct hid_device       *hid_device;
+       struct hv_input_dev_info device_info;
+       int                     connected;
 };
 
-static void deviceinfo_callback(struct hv_device *dev, struct hv_input_dev_info *info);
-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)
 {
        struct mousevsc_dev *input_dev;
@@ -344,7 +336,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
 
        if (!input_device->hid_desc) {
                pr_err("unable to allocate hid descriptor - size %d", desc->bLength);
-               goto Cleanup;
+               goto cleanup;
        }
 
        memcpy(input_device->hid_desc, desc, desc->bLength);
@@ -357,7 +349,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
        if (!input_device->report_desc) {
                pr_err("unable to allocate report descriptor - size %d",
                           input_device->report_desc_size);
-               goto Cleanup;
+               goto cleanup;
        }
 
        memcpy(input_device->report_desc,
@@ -384,7 +376,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
        if (ret != 0) {
                pr_err("unable to send synthhid device info ack - ret %d",
                           ret);
-               goto Cleanup;
+               goto cleanup;
        }
 
        input_device->device_wait_condition = 1;
@@ -392,7 +384,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
 
        return;
 
-Cleanup:
+cleanup:
        kfree(input_device->hid_desc);
        input_device->hid_desc = NULL;
 
@@ -408,6 +400,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");
@@ -416,9 +409,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,
@@ -509,22 +504,22 @@ static void mousevsc_on_channel_callback(void *context)
                                desc = (struct vmpacket_descriptor *)buffer;
 
                                switch (desc->type) {
-                                       case VM_PKT_COMP:
-                                               mousevsc_on_send_completion(
-                                                       device, desc);
-                                               break;
-
-                                       case VM_PKT_DATA_INBAND:
-                                               mousevsc_on_receive(
-                                                       device, desc);
-                                               break;
-
-                                       default:
-                                               pr_err("unhandled packet type %d, tid %llx len %d\n",
-                                                          desc->type,
-                                                          req_id,
-                                                          bytes_recvd);
-                                               break;
+                               case VM_PKT_COMP:
+                                       mousevsc_on_send_completion(
+                                               device, desc);
+                                       break;
+
+                               case VM_PKT_DATA_INBAND:
+                                       mousevsc_on_receive(
+                                               device, desc);
+                                       break;
+
+                               default:
+                                       pr_err("unhandled packet type %d, tid %llx len %d\n",
+                                                  desc->type,
+                                                  req_id,
+                                                  bytes_recvd);
+                                       break;
                                }
 
                                /* reset */
@@ -547,7 +542,7 @@ static void mousevsc_on_channel_callback(void *context)
                                }
                                break;
                        }
-               } else if (ret == -2) {
+               } else if (ret == -ENOBUFS) {
                        /* Handle large packet */
                        bufferlen = bytes_recvd;
                        buffer = kzalloc(bytes_recvd, GFP_KERNEL);
@@ -611,7 +606,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
                                        VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
        if (ret != 0) {
                pr_err("unable to send synthhid protocol request.");
-               goto Cleanup;
+               goto cleanup;
        }
 
        input_dev->protocol_wait_condition = 0;
@@ -619,7 +614,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
                input_dev->protocol_wait_condition, msecs_to_jiffies(1000));
        if (input_dev->protocol_wait_condition == 0) {
                ret = -ETIMEDOUT;
-               goto Cleanup;
+               goto cleanup;
        }
 
        response = &input_dev->protocol_resp;
@@ -628,7 +623,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
                pr_err("synthhid protocol request failed (version %d)",
                       SYNTHHID_INPUT_VERSION);
                ret = -1;
-               goto Cleanup;
+               goto cleanup;
        }
 
        input_dev->device_wait_condition = 0;
@@ -636,7 +631,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
                input_dev->device_wait_condition, msecs_to_jiffies(1000));
        if (input_dev->device_wait_condition == 0) {
                ret = -ETIMEDOUT;
-               goto Cleanup;
+               goto cleanup;
        }
 
        /*
@@ -648,12 +643,74 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
        else
                ret = -1;
 
-Cleanup:
+cleanup:
        put_input_device(device);
 
        return ret;
 }
 
+static int mousevsc_hid_open(struct hid_device *hid)
+{
+       return 0;
+}
+
+static void mousevsc_hid_close(struct hid_device *hid)
+{
+}
+
+static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len)
+{
+       struct input_device_context *input_device_ctx =
+               dev_get_drvdata(&dev->device);
+       struct hid_device *hid_dev;
+
+       /* hid_debug = -1; */
+       hid_dev = kmalloc(sizeof(struct hid_device), GFP_KERNEL);
+
+       if (hid_parse_report(hid_dev, packet, len)) {
+               DPRINT_INFO(INPUTVSC_DRV, "Unable to call hd_parse_report");
+               return;
+       }
+
+       if (hid_dev) {
+               DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
+
+               hid_dev->ll_driver->open  = mousevsc_hid_open;
+               hid_dev->ll_driver->close = mousevsc_hid_close;
+
+               hid_dev->bus = BUS_VIRTUAL;
+               hid_dev->vendor = input_device_ctx->device_info.vendor;
+               hid_dev->product = input_device_ctx->device_info.product;
+               hid_dev->version = input_device_ctx->device_info.version;
+               hid_dev->dev = dev->device;
+
+               sprintf(hid_dev->name, "%s",
+                       input_device_ctx->device_info.name);
+
+               /*
+                * HJ Do we want to call it with a 0
+                */
+               if (!hidinput_connect(hid_dev, 0)) {
+                       hid_dev->claimed |= HID_CLAIMED_INPUT;
+
+                       input_device_ctx->connected = 1;
+
+                       DPRINT_INFO(INPUTVSC_DRV,
+                                    "HID device claimed by input\n");
+               }
+
+               if (!hid_dev->claimed) {
+                       DPRINT_ERR(INPUTVSC_DRV,
+                                   "HID device not claimed by "
+                                   "input or hiddev\n");
+               }
+
+               input_device_ctx->hid_device = hid_dev;
+       }
+
+       kfree(hid_dev);
+}
+
 static int mousevsc_on_device_add(struct hv_device *device,
                                        void *additional_info)
 {
@@ -661,12 +718,13 @@ static int mousevsc_on_device_add(struct hv_device *device,
        struct mousevsc_dev *input_dev;
        struct hv_driver *input_drv;
        struct hv_input_dev_info dev_info;
+       struct input_device_context *input_device_ctx;
 
        input_dev = alloc_input_device(device);
 
        if (!input_dev) {
                ret = -1;
-               goto Cleanup;
+               goto cleanup;
        }
 
        input_dev->init_complete = false;
@@ -707,7 +765,9 @@ static int mousevsc_on_device_add(struct hv_device *device,
        strcpy(dev_info.name, "Microsoft Vmbus HID-compliant Mouse");
 
        /* Send the device info back up */
-       deviceinfo_callback(device, &dev_info);
+       input_device_ctx = dev_get_drvdata(&device->device);
+       memcpy(&input_device_ctx->device_info, &dev_info,
+              sizeof(struct hv_input_dev_info));
 
        /* Send the report desc back up */
        /* workaround SA-167 */
@@ -719,7 +779,7 @@ static int mousevsc_on_device_add(struct hv_device *device,
 
        input_dev->init_complete = true;
 
-Cleanup:
+cleanup:
        return ret;
 }
 
@@ -762,50 +822,6 @@ static int mousevsc_on_device_remove(struct hv_device *device)
 }
 
 
-/*
- * Data types
- */
-struct input_device_context {
-       struct hv_device        *device_ctx;
-       struct hid_device       *hid_device;
-       struct hv_input_dev_info device_info;
-       int                     connected;
-};
-
-
-static void deviceinfo_callback(struct hv_device *dev, struct hv_input_dev_info *info)
-{
-       struct input_device_context *input_device_ctx =
-               dev_get_drvdata(&dev->device);
-
-       memcpy(&input_device_ctx->device_info, info,
-              sizeof(struct hv_input_dev_info));
-
-       DPRINT_INFO(INPUTVSC_DRV, "%s", __func__);
-}
-
-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;
-}
-
-static void mousevsc_hid_close(struct hid_device *hid)
-{
-}
-
 static int mousevsc_probe(struct hv_device *dev)
 {
        int ret = 0;
@@ -861,112 +877,35 @@ static int mousevsc_remove(struct hv_device *dev)
        return ret;
 }
 
-static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len)
-{
-       struct input_device_context *input_device_ctx =
-               dev_get_drvdata(&dev->device);
-       struct hid_device *hid_dev;
-
-       /* hid_debug = -1; */
-       hid_dev = kmalloc(sizeof(struct hid_device), GFP_KERNEL);
-
-       if (hid_parse_report(hid_dev, packet, len)) {
-               DPRINT_INFO(INPUTVSC_DRV, "Unable to call hd_parse_report");
-               return;
-       }
-
-       if (hid_dev) {
-               DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
-
-               hid_dev->ll_driver->open  = mousevsc_hid_open;
-               hid_dev->ll_driver->close = mousevsc_hid_close;
-
-               hid_dev->bus = BUS_VIRTUAL;
-               hid_dev->vendor = input_device_ctx->device_info.vendor;
-               hid_dev->product = input_device_ctx->device_info.product;
-               hid_dev->version = input_device_ctx->device_info.version;
-               hid_dev->dev = dev->device;
-
-               sprintf(hid_dev->name, "%s",
-                       input_device_ctx->device_info.name);
-
-               /*
-                * HJ Do we want to call it with a 0
-                */
-               if (!hidinput_connect(hid_dev, 0)) {
-                       hid_dev->claimed |= HID_CLAIMED_INPUT;
-
-                       input_device_ctx->connected = 1;
-
-                       DPRINT_INFO(INPUTVSC_DRV,
-                                    "HID device claimed by input\n");
-               }
-
-               if (!hid_dev->claimed) {
-                       DPRINT_ERR(INPUTVSC_DRV,
-                                   "HID device not claimed by "
-                                   "input or hiddev\n");
-               }
-
-               input_device_ctx->hid_device = hid_dev;
-       }
-
-       kfree(hid_dev);
-}
+static const struct hv_vmbus_device_id id_table[] = {
+       /* Mouse guid */
+       { VMBUS_DEVICE(0x9E, 0xB6, 0xA8, 0xCF, 0x4A, 0x5B, 0xc0, 0x4c,
+                      0xB9, 0x8B, 0x8B, 0xA1, 0xA1, 0xF3, 0xF9, 0x5A) },
+       { },
+};
 
+/*
+ * The mouse driver is not functional; do not auto-load it.
+ */
+/* MODULE_DEVICE_TABLE(vmbus, id_table); */
 
 static struct  hv_driver mousevsc_drv = {
+       .name = "mousevsc",
+       .id_table = id_table,
        .probe = mousevsc_probe,
        .remove = mousevsc_remove,
 };
 
-static void mousevsc_drv_exit(void)
-{
-       vmbus_child_driver_unregister(&mousevsc_drv.driver);
-}
-
 static int __init mousevsc_init(void)
 {
-       struct hv_driver *drv = &mousevsc_drv;
-
-       DPRINT_INFO(INPUTVSC_DRV, "Hyper-V Mouse driver initializing.");
-
-       memcpy(&drv->dev_type, &mouse_guid,
-              sizeof(struct hv_guid));
-
-       drv->driver.name = driver_name;
-
-       /* The driver belongs to vmbus */
-       vmbus_child_driver_register(&drv->driver);
-
-       return 0;
+       return vmbus_driver_register(&mousevsc_drv);
 }
 
 static void __exit mousevsc_exit(void)
 {
-       mousevsc_drv_exit();
+       vmbus_driver_unregister(&mousevsc_drv);
 }
 
-/*
- * We don't want to automatically load this driver just yet, it's quite
- * broken.  It's safe if you want to load it yourself manually, but
- * don't inflict it on unsuspecting users, that's just mean.
- */
-#if 0
-
-/*
- * We use a PCI table to determine if we should autoload this driver  This is
- * needed by distro tools to determine if the hyperv drivers should be
- * installed and/or configured.  We don't do anything else with the table, but
- * it needs to be present.
- */
-const static struct pci_device_id microsoft_hv_pci_table[] = {
-       { PCI_DEVICE(0x1414, 0x5353) }, /* VGA compatible controller */
-       { 0 }
-};
-MODULE_DEVICE_TABLE(pci, microsoft_hv_pci_table);
-#endif
-
 MODULE_LICENSE("GPL");
 MODULE_VERSION(HV_DRV_VERSION);
 module_init(mousevsc_init);