1 files changed, 22 insertions, 51 deletions

diff --git a/drivers/input/mouse/maplemouse.c b/drivers/input/mouse/maplemouse.c
index 088f69406558..e90c60cbbf05 100644
--- a/drivers/input/mouse/maplemouse.c
+++ b/drivers/input/mouse/maplemouse.c
@@ -15,80 +15,51 @@
 MODULE_AUTHOR("YAEGASHI Takeshi <t@keshi.org>");
 MODULE_DESCRIPTION("SEGA Dreamcast mouse driver");
 
-struct dc_mouse {
-        struct input_dev dev;
-        int open;
-};
-
-
 static void dc_mouse_callback(struct mapleq *mq)
 {
         int buttons, relx, rely, relz;
         struct maple_device *mapledev = mq->dev;
-        struct dc_mouse *mouse = mapledev->private_data;
-        struct input_dev *dev = &mouse->dev;
+        struct input_dev *dev = mapledev->private_data;
         unsigned char *res = mq->recvbuf;
 
         buttons = ~res[8];
-        relx=*(unsigned short *)(res+12)-512;
-        rely=*(unsigned short *)(res+14)-512;
-        relz=*(unsigned short *)(res+16)-512;
+        relx = *(unsigned short *)(res + 12) - 512;
+        rely = *(unsigned short *)(res + 14) - 512;
+        relz = *(unsigned short *)(res + 16) - 512;
 
-        input_report_key(dev, BTN_LEFT,   buttons&4);
-        input_report_key(dev, BTN_MIDDLE, buttons&9);
-        input_report_key(dev, BTN_RIGHT,  buttons&2);
+        input_report_key(dev, BTN_LEFT,   buttons & 4);
+        input_report_key(dev, BTN_MIDDLE, buttons & 9);
+        input_report_key(dev, BTN_RIGHT,  buttons & 2);
         input_report_rel(dev, REL_X,      relx);
         input_report_rel(dev, REL_Y,      rely);
         input_report_rel(dev, REL_WHEEL,  relz);
         input_sync(dev);
 }
 
-
-static int dc_mouse_open(struct input_dev *dev)
-{
-        struct dc_mouse *mouse = dev->private;
-        mouse->open++;
-        return 0;
-}
-
-
-static void dc_mouse_close(struct input_dev *dev)
-{
-        struct dc_mouse *mouse = dev->private;
-        mouse->open--;
-}
-
-
 static int dc_mouse_connect(struct maple_device *dev)
 {
         unsigned long data = be32_to_cpu(dev->devinfo.function_data[0]);
-        struct dc_mouse *mouse;
+        struct input_dev *input_dev;
 
-        if (!(mouse = kmalloc(sizeof(struct dc_mouse), GFP_KERNEL)))
+        if (!(input_dev = kmalloc(sizeof(struct input_dev), GFP_KERNEL)))
                 return -1;
-        memset(mouse, 0, sizeof(struct dc_mouse));
-
-        dev->private_data = mouse;
-
-        mouse->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        mouse->dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
-        mouse->dev.relbit[0] = BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL);
 
-        init_input_dev(&mouse->dev);
+        dev->private_data = input_dev;
 
-        mouse->dev.private = mouse;
-        mouse->dev.open = dc_mouse_open;
-        mouse->dev.close = dc_mouse_close;
-        mouse->dev.event = NULL;
+        memset(input_dev, 0, sizeof(struct dc_mouse));
+        init_input_dev(input_dev);
+        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
+        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL);
 
-        mouse->dev.name = dev->product_name;
-        mouse->dev.id.bustype = BUS_MAPLE;
+        input_dev->name = dev->product_name;
+        input_dev->id.bustype = BUS_MAPLE;
 
-        input_register_device(&mouse->dev);
+        input_register_device(input_dev);
 
         maple_getcond_callback(dev, dc_mouse_callback, 1, MAPLE_FUNC_MOUSE);
 
-        printk(KERN_INFO "input: mouse(0x%lx): %s\n", data, mouse->dev.name);
+        printk(KERN_INFO "input: mouse(0x%lx): %s\n", data, input_dev->name);
 
         return 0;
 }
@@ -96,10 +67,10 @@ static int dc_mouse_connect(struct maple_device *dev)
 
 static void dc_mouse_disconnect(struct maple_device *dev)
 {
-        struct dc_mouse *mouse = dev->private_data;
+        struct input_dev *input_dev = dev->private_data;
 
-        input_unregister_device(&mouse->dev);
-        kfree(mouse);
+        input_unregister_device(input_dev);
+        kfree(input_dev);
 }