20 files changed, 97 insertions, 52 deletions

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 5f9d860925a1..cd50c00ab20f 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -143,7 +143,7 @@ config INPUT_APMPOWER
         ---help---
           Say Y here if you want suspend key events to trigger a user
           requested suspend through APM. This is useful on embedded
-          systems where such behviour is desired without userspace
+          systems where such behaviour is desired without userspace
           interaction. If unsure, say N.
 
           To compile this driver as a module, choose M here: the
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index ed8baa0aec3c..7a7a026ba712 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -94,11 +94,8 @@ static void evdev_event(struct input_handle *handle,
 static int evdev_fasync(int fd, struct file *file, int on)
 {
         struct evdev_client *client = file->private_data;
-        int retval;
-
-        retval = fasync_helper(fd, file, on, &client->fasync);
 
-        return retval < 0 ? retval : 0;
+        return fasync_helper(fd, file, on, &client->fasync);
 }
 
 static int evdev_flush(struct file *file, fl_owner_t id)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 913392f63f76..d44065d2e662 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -910,8 +910,6 @@ static int __init input_proc_init(void)
         if (!proc_bus_input_dir)
                 return -ENOMEM;
 
-        proc_bus_input_dir->owner = THIS_MODULE;
-
         entry = proc_create("devices", 0, proc_bus_input_dir,
                             &input_devices_fileops);
         if (!entry)
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 6f2366220a50..4224f0112849 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -159,12 +159,9 @@ static void joydev_event(struct input_handle *handle,
 
 static int joydev_fasync(int fd, struct file *file, int on)
 {
-        int retval;
         struct joydev_client *client = file->private_data;
 
-        retval = fasync_helper(fd, file, on, &client->fasync);
-
-        return retval < 0 ? retval : 0;
+        return fasync_helper(fd, file, on, &client->fasync);
 }
 
 static void joydev_free(struct device *dev)
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index e50047bfe938..77cfde571bd9 100644
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -3,7 +3,7 @@
  *      Based on drivers/usb/iforce.c
  *
  *      Copyright Yaegashi Takeshi, 2001
- *      Adrian McMenamin, 2008
+ *      Adrian McMenamin, 2008 - 2009
  */
 
 #include <linux/kernel.h>
@@ -29,7 +29,7 @@ static void dc_pad_callback(struct mapleq *mq)
         struct maple_device *mapledev = mq->dev;
         struct dc_pad *pad = maple_get_drvdata(mapledev);
         struct input_dev *dev = pad->dev;
-        unsigned char *res = mq->recvbuf;
+        unsigned char *res = mq->recvbuf->buf;
 
         buttons = ~le16_to_cpup((__le16 *)(res + 8));
 
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 35561689ff38..ea2638b41982 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -13,11 +13,11 @@ menuconfig INPUT_KEYBOARD
 if INPUT_KEYBOARD
 
 config KEYBOARD_ATKBD
-        tristate "AT keyboard" if EMBEDDED || !X86_PC
+        tristate "AT keyboard" if EMBEDDED || !X86
         default y
         select SERIO
         select SERIO_LIBPS2
-        select SERIO_I8042 if X86_PC
+        select SERIO_I8042 if X86
         select SERIO_GSCPS2 if GSC
         help
           Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index abb04c82c622..634af6a8e6b3 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -21,8 +21,6 @@
 #include <linux/slab.h>
 
 #include <mach/corgi.h>
-#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
 #include <mach/pxa2xx-gpio.h>
 #include <asm/hardware/scoop.h>
 
diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c
index 22f17a593be7..5aa2361aef95 100644
--- 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;
 }
 
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index 5c8a1bcf7ca7..cea70e6a1031 100644
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -219,6 +219,8 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
                   pdata->scan_timing, priv->iomem_base + KYCR1_OFFS);
         iowrite16(0, priv->iomem_base + KYOUTDR_OFFS);
         iowrite16(KYCR2_IRQ_LEVEL, priv->iomem_base + KYCR2_OFFS);
+
+        device_init_wakeup(&pdev->dev, 1);
         return 0;
  err5:
         free_irq(irq, pdev);
@@ -253,17 +255,48 @@ static int __devexit sh_keysc_remove(struct platform_device *pdev)
         return 0;
 }
 
+static int sh_keysc_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
+        int irq = platform_get_irq(pdev, 0);
+        unsigned short value;
+
+        value = ioread16(priv->iomem_base + KYCR1_OFFS);
+
+        if (device_may_wakeup(dev)) {
+                value |= 0x80;
+                enable_irq_wake(irq);
+        }
+        else
+                value &= ~0x80;
+
+        iowrite16(value, priv->iomem_base + KYCR1_OFFS);
+        return 0;
+}
+
+static int sh_keysc_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        int irq = platform_get_irq(pdev, 0);
+
+        if (device_may_wakeup(dev))
+                disable_irq_wake(irq);
 
-#define sh_keysc_suspend NULL
-#define sh_keysc_resume NULL
+        return 0;
+}
+
+static struct dev_pm_ops sh_keysc_dev_pm_ops = {
+        .suspend = sh_keysc_suspend,
+        .resume = sh_keysc_resume,
+};
 
 struct platform_driver sh_keysc_device_driver = {
         .probe          = sh_keysc_probe,
         .remove         = __devexit_p(sh_keysc_remove),
-        .suspend        = sh_keysc_suspend,
-        .resume         = sh_keysc_resume,
         .driver         = {
                 .name   = "sh_keysc",
+                .pm     = &sh_keysc_dev_pm_ops,
         }
 };
 
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 9d1781a618e9..13967422658c 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -21,8 +21,6 @@
 #include <linux/slab.h>
 
 #include <mach/spitz.h>
-#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
 #include <mach/pxa2xx-gpio.h>
 
 #define KB_ROWS                 7
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 2a92e19c1509..c66cc3d08c2f 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -17,7 +17,7 @@ config MOUSE_PS2
         default y
         select SERIO
         select SERIO_LIBPS2
-        select SERIO_I8042 if X86_PC
+        select SERIO_I8042 if X86
         select SERIO_GSCPS2 if GSC
         help
           Say Y here if you have a PS/2 mouse connected to your system. This
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 0db8d16c5edd..5e5eb88d8d1e 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -18,7 +18,7 @@
 
 /*
  * Timer function which is run every scan_ms ms when the device is opened.
- * The dev input varaible is set to the the input_dev pointer.
+ * The dev input variable is set to the the input_dev pointer.
  */
 static void gpio_mouse_scan(struct input_polled_dev *dev)
 {
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index a14a6b0f7af0..a1ad2f1a7bb3 100644
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -381,7 +381,7 @@ static void hgpk_disconnect(struct psmouse *psmouse)
 
 static void hgpk_recalib_work(struct work_struct *work)
 {
-        struct delayed_work *w = container_of(work, struct delayed_work, work);
+        struct delayed_work *w = to_delayed_work(work);
         struct hgpk_data *priv = container_of(w, struct hgpk_data, recalib_wq);
         struct psmouse *psmouse = priv->psmouse;
 
diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c
index 56c079ef5018..272deddc8db6 100644
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
@@ -22,10 +22,10 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/input.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/io.h>
 #include <asm/hardware/iomd.h>
 
 MODULE_AUTHOR("Vojtech Pavlik, Russell King");
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index ef99a7e6d40c..17fd6d46d082 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -403,12 +403,9 @@ static void mousedev_event(struct input_handle *handle,
 
 static int mousedev_fasync(int fd, struct file *file, int on)
 {
-        int retval;
         struct mousedev_client *client = file->private_data;
 
-        retval = fasync_helper(fd, file, on, &client->fasync);
-
-        return retval < 0 ? retval : 0;
+        return fasync_helper(fd, file, on, &client->fasync);
 }
 
 static void mousedev_free(struct device *dev)
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 7f36edd34f8b..ed045c99f84b 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -33,10 +33,10 @@
 #include <linux/serio.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 #include <asm/irq.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/hardware/iomd.h>
 #include <asm/system.h>
 
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 06bbd0e74c6f..b03009bb7468 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -58,10 +58,8 @@ static unsigned int serio_raw_no;
 static int serio_raw_fasync(int fd, struct file *file, int on)
 {
         struct serio_raw_list *list = file->private_data;
-        int retval;
 
-        retval = fasync_helper(fd, file, on, &list->fasync);
-        return retval < 0 ? retval : 0;
+        return fasync_helper(fd, file, on, &list->fasync);
 }
 
 static struct serio_raw *serio_raw_locate(int minor)
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 7c27c8b9b6d0..056ac77e2cf0 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -295,7 +295,7 @@ name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
 static DEVICE_ATTR(name, S_IRUGO, name ## _show, NULL);
 
 
-/* Sysfs conventions report temperatures in millidegrees Celcius.
+/* Sysfs conventions report temperatures in millidegrees Celsius.
  * ADS7846 could use the low-accuracy two-sample scheme, but can't do the high
  * accuracy scheme without calibration data.  For now we won't try either;
  * userspace sees raw sensor values, and must scale/calibrate appropriately.
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 3fb51b54fe61..94a1919d439d 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -21,7 +21,6 @@
 
 #include <mach/sharpsl.h>
 #include <mach/hardware.h>
-#include <mach/pxa-regs.h>
 #include <mach/pxa2xx-gpio.h>
 
 
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c
index 504ca11749a1..141dd584330e 100644
--- a/drivers/input/touchscreen/migor_ts.c
+++ b/drivers/input/touchscreen/migor_ts.c
@@ -198,6 +198,7 @@ static int migor_ts_probe(struct i2c_client *client,
                 goto err2;
         }
 
+        device_init_wakeup(&client->dev, 1);
         return 0;
 
  err2:
@@ -224,6 +225,26 @@ static int migor_ts_remove(struct i2c_client *client)
         return 0;
 }
 
+static int migor_ts_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        struct migor_ts_priv *priv = dev_get_drvdata(&client->dev);
+
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(priv->irq);
+
+        return 0;
+}
+
+static int migor_ts_resume(struct i2c_client *client)
+{
+        struct migor_ts_priv *priv = dev_get_drvdata(&client->dev);
+
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(priv->irq);
+
+        return 0;
+}
+
 static const struct i2c_device_id migor_ts_id[] = {
         { "migor_ts", 0 },
         { }
@@ -236,6 +257,8 @@ static struct i2c_driver migor_ts_driver = {
         },
         .probe = migor_ts_probe,
         .remove = migor_ts_remove,
+        .suspend = migor_ts_suspend,
+        .resume = migor_ts_resume,
         .id_table = migor_ts_id,
 };