Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/hid.h

11 files changed, 26 insertions, 26 deletions

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index bba5894fcecd..a00fe470a829 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -23,6 +23,7 @@
 #include <linux/kthread.h>
 #include <linux/sched.h>        /* HZ */
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 /*#include <asm/io.h>*/
 
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 105112fb7b57..80cdebcbcb99 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -178,9 +178,9 @@ static int iforce_usb_probe(struct usb_interface *intf,
 
 fail:
         if (iforce) {
-                if (iforce->irq) usb_free_urb(iforce->irq);
-                if (iforce->out) usb_free_urb(iforce->out);
-                if (iforce->ctrl) usb_free_urb(iforce->ctrl);
+                usb_free_urb(iforce->irq);
+                usb_free_urb(iforce->out);
+                usb_free_urb(iforce->ctrl);
                 kfree(iforce);
         }
 
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 498e64a00e3c..c621a9177a56 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -567,9 +567,9 @@ static int atkbd_set_leds(struct atkbd *atkbd)
  * interrupt context.
  */
 
-static void atkbd_event_work(void *data)
+static void atkbd_event_work(struct work_struct *work)
 {
-        struct atkbd *atkbd = data;
+        struct atkbd *atkbd = container_of(work, struct atkbd, event_work);
 
         mutex_lock(&atkbd->event_mutex);
 
@@ -943,7 +943,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
 
         atkbd->dev = dev;
         ps2_init(&atkbd->ps2dev, serio);
-        INIT_WORK(&atkbd->event_work, atkbd_event_work, atkbd);
+        INIT_WORK(&atkbd->event_work, atkbd_event_work);
         mutex_init(&atkbd->event_mutex);
 
         switch (serio->id.type) {
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 1789785813ee..3d4d0a0ede28 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -59,11 +59,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * email or by paper mail:
- * Jan-Benedict Glaw, Lilienstraße 16, 33790 Hörste (near Halle/Westf.),
- * Germany.
  */
 
 #include <linux/delay.h>
@@ -577,9 +572,9 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
  * were in.
  */
 static void
-lkkbd_reinit (void *data)
+lkkbd_reinit (struct work_struct *work)
 {
-        struct lkkbd *lk = data;
+        struct lkkbd *lk = container_of(work, struct lkkbd, tq);
         int division;
         unsigned char leds_on = 0;
         unsigned char leds_off = 0;
@@ -656,7 +651,7 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
 
         lk->serio = serio;
         lk->dev = input_dev;
-        INIT_WORK (&lk->tq, lkkbd_reinit, lk);
+        INIT_WORK (&lk->tq, lkkbd_reinit);
         lk->bell_volume = bell_volume;
         lk->keyclick_volume = keyclick_volume;
         lk->ctrlclick_volume = ctrlclick_volume;
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index d6ab6d4b1fa8..3826db9403e6 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -208,9 +208,9 @@ static int sunkbd_initialize(struct sunkbd *sunkbd)
  * were in.
  */
 
-static void sunkbd_reinit(void *data)
+static void sunkbd_reinit(struct work_struct *work)
 {
-        struct sunkbd *sunkbd = data;
+        struct sunkbd *sunkbd = container_of(work, struct sunkbd, tq);
 
         wait_event_interruptible_timeout(sunkbd->wait, sunkbd->reset >= 0, HZ);
 
@@ -248,7 +248,7 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
         sunkbd->serio = serio;
         sunkbd->dev = input_dev;
         init_waitqueue_head(&sunkbd->wait);
-        INIT_WORK(&sunkbd->tq, sunkbd_reinit, sunkbd);
+        INIT_WORK(&sunkbd->tq, sunkbd_reinit);
         snprintf(sunkbd->phys, sizeof(sunkbd->phys), "%s/input0", serio->phys);
 
         serio_set_drvdata(serio, sunkbd);
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index ab4da79ee560..31d5a13bfd6b 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -695,7 +695,9 @@ static int __init hp_sdc_rtc_init(void)
 
         if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))
                 return ret;
-        misc_register(&hp_sdc_rtc_dev);
+        if (misc_register(&hp_sdc_rtc_dev) != 0)
+                printk(KERN_INFO "Could not register misc. dev for i8042 rtc\n");
+
         create_proc_read_entry ("driver/rtc", 0, NULL,
                                 hp_sdc_rtc_read_proc, NULL);
 
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index e626b1e737fa..a0e4a033e2db 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -888,9 +888,10 @@ static int psmouse_poll(struct psmouse *psmouse)
  * psmouse_resync() attempts to re-validate current protocol.
  */
 
-static void psmouse_resync(void *p)
+static void psmouse_resync(struct work_struct *work)
 {
-        struct psmouse *psmouse = p, *parent = NULL;
+        struct psmouse *parent = NULL, *psmouse =
+                container_of(work, struct psmouse, resync_work);
         struct serio *serio = psmouse->ps2dev.serio;
         psmouse_ret_t rc = PSMOUSE_GOOD_DATA;
         int failed = 0, enabled = 0;
@@ -1121,7 +1122,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
                 goto err_free;
 
         ps2_init(&psmouse->ps2dev, serio);
-        INIT_WORK(&psmouse->resync_work, psmouse_resync, psmouse);
+        INIT_WORK(&psmouse->resync_work, psmouse_resync);
         psmouse->dev = input_dev;
         snprintf(psmouse->phys, sizeof(psmouse->phys), "%s/input0", serio->phys);
 
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index e5b1b60757bb..b3e84d3bb7f7 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -251,9 +251,9 @@ EXPORT_SYMBOL(ps2_command);
  * ps2_schedule_command(), to a PS/2 device (keyboard, mouse, etc.)
  */
 
-static void ps2_execute_scheduled_command(void *data)
+static void ps2_execute_scheduled_command(struct work_struct *work)
 {
-        struct ps2work *ps2work = data;
+        struct ps2work *ps2work = container_of(work, struct ps2work, work);
 
         ps2_command(ps2work->ps2dev, ps2work->param, ps2work->command);
         kfree(ps2work);
@@ -278,7 +278,7 @@ int ps2_schedule_command(struct ps2dev *ps2dev, unsigned char *param, int comman
         ps2work->ps2dev = ps2dev;
         ps2work->command = command;
         memcpy(ps2work->param, param, send);
-        INIT_WORK(&ps2work->work, ps2_execute_scheduled_command, ps2work);
+        INIT_WORK(&ps2work->work, ps2_execute_scheduled_command);
 
         if (!schedule_work(&ps2work->work)) {
                 kfree(ps2work);
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 8c717042f611..f0ce822c1028 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -35,6 +35,7 @@
 #include <linux/slab.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Serio abstraction core");
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 0e343a6cacc9..088ebc348ba3 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -297,7 +297,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
 
         serio_raw->dev.minor = PSMOUSE_MINOR;
         serio_raw->dev.name = serio_raw->name;
-        serio_raw->dev.dev = &serio->dev;
+        serio_raw->dev.parent = &serio->dev;
         serio_raw->dev.fops = &serio_raw_fops;
 
         err = misc_register(&serio_raw->dev);
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 8f56af8cd7a0..c6164b6f476a 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -190,7 +190,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
 {
         struct spi_device       *spi = to_spi_device(dev);
         struct ads7846          *ts = dev_get_drvdata(dev);
-        struct ser_req          *req = kzalloc(sizeof *req, SLAB_KERNEL);
+        struct ser_req          *req = kzalloc(sizeof *req, GFP_KERNEL);
         int                     status;
         int                     sample;
         int                     i;