Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / maple_keyb.c

diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c
index 22f17a593be78ca2f6bb6fda1a35323e8e06e006..5aa2361aef95be73080e1392185ac57a2275a220 100644 (file)
--- a/drivers/input/keyboard/maple_keyb.c
+++ b/drivers/input/keyboard/maple_keyb.c
@@ -1,8 +1,8 @@
 /*
  * SEGA Dreamcast keyboard driver
  * Based on drivers/usb/usbkbd.c
- * Copyright YAEGASHI Takeshi, 2001
- * Porting to 2.6 Copyright Adrian McMenamin, 2007, 2008
+ * Copyright (c) YAEGASHI Takeshi, 2001
+ * Porting to 2.6 Copyright (c) Adrian McMenamin, 2007 - 2009
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ static DEFINE_MUTEX(maple_keyb_mutex);
 
 #define NR_SCANCODES 256
 
-MODULE_AUTHOR("YAEGASHI Takeshi, Adrian McMenamin");
+MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk");
 MODULE_DESCRIPTION("SEGA Dreamcast keyboard driver");
 MODULE_LICENSE("GPL");
 
@@ -115,7 +115,7 @@ static void dc_scan_kbd(struct dc_kbd *kbd)
                                input_event(dev, EV_MSC, MSC_SCAN, code);
                                input_report_key(dev, keycode, 0);
                        } else
-                               printk(KERN_DEBUG "maple_keyb: "
+                               dev_dbg(&dev->dev,
                                        "Unknown key (scancode %#x) released.",
                                        code);
                }
@@ -127,7 +127,7 @@ static void dc_scan_kbd(struct dc_kbd *kbd)
                                input_event(dev, EV_MSC, MSC_SCAN, code);
                                input_report_key(dev, keycode, 1);
                        } else
-                               printk(KERN_DEBUG "maple_keyb: "
+                               dev_dbg(&dev->dev,
                                        "Unknown key (scancode %#x) pressed.",
                                        code);
                }
@@ -140,7 +140,7 @@ static void dc_kbd_callback(struct mapleq *mq)
 {
        struct maple_device *mapledev = mq->dev;
        struct dc_kbd *kbd = maple_get_drvdata(mapledev);
-       unsigned long *buf = mq->recvbuf;
+       unsigned long *buf = (unsigned long *)(mq->recvbuf->buf);
 
        /*
         * We should always get the lock because the only
@@ -159,22 +159,27 @@ static void dc_kbd_callback(struct mapleq *mq)
 
 static int probe_maple_kbd(struct device *dev)
 {
-       struct maple_device *mdev = to_maple_dev(dev);
-       struct maple_driver *mdrv = to_maple_driver(dev->driver);
+       struct maple_device *mdev;
+       struct maple_driver *mdrv;
        int i, error;
        struct dc_kbd *kbd;
        struct input_dev *idev;
 
-       if (!(mdev->function & MAPLE_FUNC_KEYBOARD))
-               return -EINVAL;
+       mdev = to_maple_dev(dev);
+       mdrv = to_maple_driver(dev->driver);
 
        kbd = kzalloc(sizeof(struct dc_kbd), GFP_KERNEL);
-       idev = input_allocate_device();
-       if (!kbd || !idev) {
+       if (!kbd) {
                error = -ENOMEM;
                goto fail;
        }
 
+       idev = input_allocate_device();
+       if (!idev) {
+               error = -ENOMEM;
+               goto fail_idev_alloc;
+       }
+
        kbd->dev = idev;
        memcpy(kbd->keycode, dc_kbd_keycode, sizeof(kbd->keycode));
 
@@ -195,7 +200,7 @@ static int probe_maple_kbd(struct device *dev)
 
        error = input_register_device(idev);
        if (error)
-               goto fail;
+               goto fail_register;
 
        /* Maple polling is locked to VBLANK - which may be just 50/s */
        maple_getcond_callback(mdev, dc_kbd_callback, HZ/50,
@@ -207,10 +212,12 @@ static int probe_maple_kbd(struct device *dev)
 
        return error;
 
-fail:
+fail_register:
+       maple_set_drvdata(mdev, NULL);
        input_free_device(idev);
+fail_idev_alloc:
        kfree(kbd);
-       maple_set_drvdata(mdev, NULL);
+fail:
        return error;
 }