Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

Some manual fixups required due to clashes with the PF_FREEZE cleanups.

1 files changed, 1 insertions, 21 deletions

diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c
index 859ed771ee0a..eecbde294f1f 100644
--- a/drivers/input/keyboard/maple_keyb.c
+++ b/drivers/input/keyboard/maple_keyb.c
@@ -1,6 +1,6 @@
 /*
  *      $Id: maple_keyb.c,v 1.4 2004/03/22 01:18:15 lethal Exp $
- *      SEGA Dreamcast keyboard driver
+ *      SEGA Dreamcast keyboard driver
  *      Based on drivers/usb/usbkbd.c
  */
 
@@ -40,7 +40,6 @@ struct dc_kbd {
         struct input_dev dev;
         unsigned char new[8];
         unsigned char old[8];
-        int open;
 };
 
 
@@ -95,22 +94,6 @@ static void dc_kbd_callback(struct mapleq *mq)
         }
 }
 
-
-static int dc_kbd_open(struct input_dev *dev)
-{
-        struct dc_kbd *kbd = dev->private;
-        kbd->open++;
-        return 0;
-}
-
-
-static void dc_kbd_close(struct input_dev *dev)
-{
-        struct dc_kbd *kbd = dev->private;
-        kbd->open--;
-}
-
-
 static int dc_kbd_connect(struct maple_device *dev)
 {
         int i;
@@ -133,9 +116,6 @@ static int dc_kbd_connect(struct maple_device *dev)
         clear_bit(0, kbd->dev.keybit);
 
         kbd->dev.private = kbd;
-        kbd->dev.open = dc_kbd_open;
-        kbd->dev.close = dc_kbd_close;
-        kbd->dev.event = NULL;
 
         kbd->dev.name = dev->product_name;
         kbd->dev.id.bustype = BUS_MAPLE;