64 files changed, 157 insertions, 239 deletions
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index 7249d32429..650acf3a30 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -57,7 +57,7 @@ static DEFINE_MUTEX(amijoy_mutex);
 static struct input_dev *amijoy_dev[2];
 static char *amijoy_phys[2] = { "amijoy/input0", "amijoy/input1" };
-static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp)
+static irqreturn_t amijoy_interrupt(int irq, void *dummy)
 {
        int i, data = 0, button = 0;
@@ -69,8 +69,6 @@ static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp)
                                case 1: data = ~amiga_custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break;
                        }
-                        input_regs(amijoy_dev[i], fp);
                        input_report_key(amijoy_dev[i], BTN_TRIGGER, button);
                        input_report_abs(amijoy_dev[i], ABS_X, ((data >> 1) & 1) - ((data >> 9) & 1));
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 8632d47a7f..808f05932a 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -155,7 +155,7 @@ static int mark_core_as_ready(struct iforce *iforce, unsigned short addr)
        return -1;
 }
-void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, struct pt_regs *regs)
+void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
 {
        struct input_dev *dev = iforce->dev;
        int i;
@@ -183,9 +183,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data,
                case 0x01:      /* joystick position data */
                case 0x03:      /* wheel position data */
-                        input_regs(dev, regs);
                        if (HI(cmd) == 1) {
                                input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0]));
                                input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2]));
@@ -224,7 +221,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data,
                        break;
                case 0x02:      /* status report */
-                        input_regs(dev, regs);
                        input_report_key(dev, BTN_DEAD, data[0] & 0x02);
                        input_sync(dev);
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index 64a78c5154..ca08f45c20 100644
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -81,7 +81,7 @@ static void iforce_serio_write_wakeup(struct serio *serio)
 }
 static irqreturn_t iforce_serio_irq(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct iforce *iforce = serio_get_drvdata(serio);
@@ -115,7 +115,7 @@ static irqreturn_t iforce_serio_irq(struct serio *serio,
        }
        if (iforce->idx == iforce->len) {
-                iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data, regs);
+                iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data);
                iforce->pkt = 0;
                iforce->id  = 0;
                iforce->len = 0;
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index fe79d15845..105112fb7b 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -74,7 +74,7 @@ void iforce_usb_xmit(struct iforce *iforce)
        spin_unlock_irqrestore(&iforce->xmit_lock, flags);
 }
-static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs)
+static void iforce_usb_irq(struct urb *urb)
 {
        struct iforce *iforce = urb->context;
        int status;
@@ -96,7 +96,7 @@ static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs)
        }
        iforce_process_packet(iforce,
-                (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs);
+                (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1);
 exit:
        status = usb_submit_urb (urb, GFP_ATOMIC);
@@ -105,7 +105,7 @@ exit:
                     __FUNCTION__, status);
 }
-static void iforce_usb_out(struct urb *urb, struct pt_regs *regs)
+static void iforce_usb_out(struct urb *urb)
 {
        struct iforce *iforce = urb->context;
@@ -119,7 +119,7 @@ static void iforce_usb_out(struct urb *urb, struct pt_regs *regs)
        wake_up(&iforce->wait);
 }
-static void iforce_usb_ctrl(struct urb *urb, struct pt_regs *regs)
+static void iforce_usb_ctrl(struct urb *urb)
 {
        struct iforce *iforce = urb->context;
        if (urb->status) return;
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index 947df27398..ffaeaefa1a 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -160,7 +160,7 @@ void iforce_delete_device(struct iforce *iforce);
 /* iforce-packets.c */
 int iforce_control_playback(struct iforce*, u16 id, unsigned int);
-void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, struct pt_regs *regs);
+void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data);
 int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data);
 void iforce_dump_packet(char *msg, u16 cmd, unsigned char *data) ;
 int iforce_get_id_packet(struct iforce *iforce, char *packet);
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 168b1061a0..e3d19444ba 100644
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -82,7 +82,7 @@ static int magellan_crunch_nibbles(unsigned char *data, int count)
        return 0;
 }
-static void magellan_process_packet(struct magellan* magellan, struct pt_regs *regs)
+static void magellan_process_packet(struct magellan* magellan)
 {
        struct input_dev *dev = magellan->dev;
        unsigned char *data = magellan->data;
@@ -90,8 +90,6 @@ static void magellan_process_packet(struct magellan* magellan, struct pt_regs *r
        if (!magellan->idx) return;
-        input_regs(dev, regs);
        switch (magellan->data[0]) {
                case 'd':                               /* Axis data */
@@ -115,12 +113,12 @@ static void magellan_process_packet(struct magellan* magellan, struct pt_regs *r
 }
 static irqreturn_t magellan_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct magellan* magellan = serio_get_drvdata(serio);
        if (data == '\r') {
-                magellan_process_packet(magellan, regs);
+                magellan_process_packet(magellan);
                magellan->idx = 0;
        } else {
                if (magellan->idx < MAGELLAN_MAX_LENGTH)
diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index 7a19ee0529..2a9808cf82 100644
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -82,7 +82,7 @@ struct spaceball {
 * SpaceBall.
 */
-static void spaceball_process_packet(struct spaceball* spaceball, struct pt_regs *regs)
+static void spaceball_process_packet(struct spaceball* spaceball)
 {
        struct input_dev *dev = spaceball->dev;
        unsigned char *data = spaceball->data;
@@ -90,8 +90,6 @@ static void spaceball_process_packet(struct spaceball* spaceball, struct pt_regs
        if (spaceball->idx < 2) return;
-        input_regs(dev, regs);
        switch (spaceball->data[0]) {
                case 'D':                                       /* Ball data */
@@ -151,13 +149,13 @@ static void spaceball_process_packet(struct spaceball* spaceball, struct pt_regs
 */
 static irqreturn_t spaceball_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct spaceball *spaceball = serio_get_drvdata(serio);
        switch (data) {
                case 0xd:
-                        spaceball_process_packet(spaceball, regs);
+                        spaceball_process_packet(spaceball);
                        spaceball->idx = 0;
                        spaceball->escape = 0;
                        break;
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index 3e2782e798..c4db0247c5 100644
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -74,7 +74,7 @@ static unsigned char *spaceorb_errors[] = { "EEPROM storing 0 failed", "Receive
 * SpaceOrb.
 */
-static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *regs)
+static void spaceorb_process_packet(struct spaceorb *spaceorb)
 {
        struct input_dev *dev = spaceorb->dev;
        unsigned char *data = spaceorb->data;
@@ -86,8 +86,6 @@ static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *r
        for (i = 0; i < spaceorb->idx; i++) c ^= data[i];
        if (c) return;
-        input_regs(dev, regs);
        switch (data[0]) {
                case 'R':                               /* Reset packet */
@@ -131,12 +129,12 @@ static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *r
 }
 static irqreturn_t spaceorb_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct spaceorb* spaceorb = serio_get_drvdata(serio);
        if (~data & 0x80) {
-                if (spaceorb->idx) spaceorb_process_packet(spaceorb, regs);
+                if (spaceorb->idx) spaceorb_process_packet(spaceorb);
                spaceorb->idx = 0;
        }
        if (spaceorb->idx < SPACEORB_MAX_LENGTH)
diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index 011ec4858e..1ffb032233 100644
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -64,15 +64,13 @@ struct stinger {
 * Stinger. It updates the data accordingly.
 */
-static void stinger_process_packet(struct stinger *stinger, struct pt_regs *regs)
+static void stinger_process_packet(struct stinger *stinger)
 {
        struct input_dev *dev = stinger->dev;
        unsigned char *data = stinger->data;
        if (!stinger->idx) return;
-        input_regs(dev, regs);
        input_report_key(dev, BTN_A,      ((data[0] & 0x20) >> 5));
        input_report_key(dev, BTN_B,      ((data[0] & 0x10) >> 4));
        input_report_key(dev, BTN_C,      ((data[0] & 0x08) >> 3));
@@ -99,7 +97,7 @@ static void stinger_process_packet(struct stinger *stinger, struct pt_regs *regs
 */
 static irqreturn_t stinger_interrupt(struct serio *serio,
-        unsigned char data, unsigned int flags, struct pt_regs *regs)
+        unsigned char data, unsigned int flags)
 {
        struct stinger *stinger = serio_get_drvdata(serio);
@@ -109,7 +107,7 @@ static irqreturn_t stinger_interrupt(struct serio *serio,
                stinger->data[stinger->idx++] = data;
        if (stinger->idx == 4) {
-                stinger_process_packet(stinger, regs);
+                stinger_process_packet(stinger);
                stinger->idx = 0;
        }
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index 076f237d96..49085df2d6 100644
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -104,7 +104,7 @@ struct twidjoy {
 * Twiddler. It updates the data accordingly.
 */
-static void twidjoy_process_packet(struct twidjoy *twidjoy, struct pt_regs *regs)
+static void twidjoy_process_packet(struct twidjoy *twidjoy)
 {
        struct input_dev *dev = twidjoy->dev;
        unsigned char *data = twidjoy->data;
@@ -113,8 +113,6 @@ static void twidjoy_process_packet(struct twidjoy *twidjoy, struct pt_regs *regs
        button_bits = ((data[1] & 0x7f) << 7) | (data[0] & 0x7f);
-        input_regs(dev, regs);
        for (bp = twidjoy_buttons; bp->bitmask; bp++) {
                int value = (button_bits & (bp->bitmask << bp->bitshift)) >> bp->bitshift;
                int i;
@@ -141,7 +139,7 @@ static void twidjoy_process_packet(struct twidjoy *twidjoy, struct pt_regs *regs
 * packet processing routine.
 */
-static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs)
+static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, unsigned int flags)
 {
        struct twidjoy *twidjoy = serio_get_drvdata(serio);
@@ -158,7 +156,7 @@ static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, un
                twidjoy->data[twidjoy->idx++] = data;
        if (twidjoy->idx == TWIDJOY_MAX_LENGTH) {
-                twidjoy_process_packet(twidjoy, regs);
+                twidjoy_process_packet(twidjoy);
                twidjoy->idx = 0;
        }
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index f9c1a03214..35edea1ab9 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -64,15 +64,13 @@ struct warrior {
 * Warrior. It updates the data accordingly.
 */
-static void warrior_process_packet(struct warrior *warrior, struct pt_regs *regs)
+static void warrior_process_packet(struct warrior *warrior)
 {
        struct input_dev *dev = warrior->dev;
        unsigned char *data = warrior->data;
        if (!warrior->idx) return;
-        input_regs(dev, regs);
        switch ((data[0] >> 4) & 7) {
                case 1:                                 /* Button data */
                        input_report_key(dev, BTN_TRIGGER,  data[3]       & 1);
@@ -101,12 +99,12 @@ static void warrior_process_packet(struct warrior *warrior, struct pt_regs *regs
 */
 static irqreturn_t warrior_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct warrior *warrior = serio_get_drvdata(serio);
        if (data & 0x80) {
-                if (warrior->idx) warrior_process_packet(warrior, regs);
+                if (warrior->idx) warrior_process_packet(warrior);
                warrior->idx = 0;
                warrior->len = warrior_lengths[(data >> 4) & 7];
        }
@@ -115,7 +113,7 @@ static irqreturn_t warrior_interrupt(struct serio *serio,
                warrior->data[warrior->idx++] = data;
        if (warrior->idx == warrior->len) {
-                if (warrior->idx) warrior_process_packet(warrior, regs);
+                if (warrior->idx) warrior_process_packet(warrior);
                warrior->idx = 0;
                warrior->len = 0;
        }
diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c
index f1f9db9d28..8abdbd0ee8 100644
--- a/drivers/input/keyboard/amikbd.c
+++ b/drivers/input/keyboard/amikbd.c
@@ -158,7 +158,7 @@ static const char *amikbd_messages[8] = {
 static struct input_dev *amikbd_dev;
-static irqreturn_t amikbd_interrupt(int irq, void *dummy, struct pt_regs *fp)
+static irqreturn_t amikbd_interrupt(int irq, void *dummy)
 {
        unsigned char scancode, down;
@@ -171,8 +171,6 @@ static irqreturn_t amikbd_interrupt(int irq, void *dummy, struct pt_regs *fp)
        scancode >>= 1;
        if (scancode < 0x78) {          /* scancodes < 0x78 are keys */
-                input_regs(amikbd_dev, fp);
                if (scancode == 98) {   /* CapsLock is a toggle switch key on Amiga */
                        input_report_key(amikbd_dev, scancode, 1);
                        input_report_key(amikbd_dev, scancode, 0);
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 40244d4ce0..b6ef9eaad1 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -318,7 +318,7 @@ static unsigned int atkbd_compat_scancode(struct atkbd *atkbd, unsigned int code
 */
 static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
-                        unsigned int flags, struct pt_regs *regs)
+                        unsigned int flags)
 {
        struct atkbd *atkbd = serio_get_drvdata(serio);
        struct input_dev *dev = atkbd->dev;
@@ -458,7 +458,6 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
                                atkbd->time = jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]) / 2;
                        }
-                        input_regs(dev, regs);
                        input_event(dev, EV_KEY, keycode, value);
                        input_sync(dev);
@@ -469,7 +468,6 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
        }
        if (atkbd->scroll) {
-                input_regs(dev, regs);
                if (click != -1)
                        input_report_key(dev, BTN_MIDDLE, click);
                input_report_rel(dev, REL_WHEEL, scroll);
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 1e03153b9b..cb70970625 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -129,7 +129,7 @@ static inline void corgikbd_reset_col(int col)
 */
 /* Scan the hardware keyboard and push any changes up through the input layer */
-static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data, struct pt_regs *regs)
+static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data)
 {
        unsigned int row, col, rowd;
        unsigned long flags;
@@ -140,9 +140,6 @@ static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data, struct pt_regs
        spin_lock_irqsave(&corgikbd_data->lock, flags);
-        if (regs)
-                input_regs(corgikbd_data->input, regs);
        num_pressed = 0;
        for (col = 0; col < KB_COLS; col++) {
                /*
@@ -191,14 +188,14 @@ static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data, struct pt_regs
 /*
 * corgi keyboard interrupt handler.
 */
-static irqreturn_t corgikbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t corgikbd_interrupt(int irq, void *dev_id)
 {
        struct corgikbd *corgikbd_data = dev_id;
        if (!timer_pending(&corgikbd_data->timer)) {
                /** wait chattering delay **/
                udelay(20);
-                corgikbd_scankeyboard(corgikbd_data, regs);
+                corgikbd_scankeyboard(corgikbd_data);
        }
        return IRQ_HANDLED;
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 2e4abdc263..c9b0b8978c 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -198,7 +198,7 @@ static void hil_kbd_process_err(struct hil_kbd *kbd) {
 }
 static irqreturn_t hil_kbd_interrupt(struct serio *serio, 
-              unsigned char data, unsigned int flags, struct pt_regs *regs)
+              unsigned char data, unsigned int flags)
 {
        struct hil_kbd *kbd;
        hil_packet packet;
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index d22c7c6242..54bc569db4 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -150,7 +150,7 @@ static inline void handle_data(unsigned char s, unsigned char c)
 /* 
 * Handle HIL interrupts.
 */
-static irqreturn_t hil_interrupt(int irq, void *handle, struct pt_regs *regs)
+static irqreturn_t hil_interrupt(int irq, void *handle)
 {
        unsigned char s, c;
        
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 5174224cad..708d5a1bc3 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -453,8 +453,7 @@ lkkbd_detection_done (struct lkkbd *lk)
 * is received.
 */
 static irqreturn_t
-lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags,
+lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags)
-                struct pt_regs *regs)
 {
        struct lkkbd *lk = serio_get_drvdata (serio);
        int i;
@@ -473,7 +472,6 @@ lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags,
        switch (data) {
                case LK_ALL_KEYS_UP:
-                        input_regs (lk->dev, regs);
                        for (i = 0; i < ARRAY_SIZE (lkkbd_keycode); i++)
                                if (lk->keycode[i] != KEY_RESERVED)
                                        input_report_key (lk->dev, lk->keycode[i], 0);
@@ -501,7 +499,6 @@ lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags,
                default:
                        if (lk->keycode[data] != KEY_RESERVED) {
-                                input_regs (lk->dev, regs);
                                if (!test_bit (lk->keycode[data], lk->dev->key))
                                        input_report_key (lk->dev, lk->keycode[data], 1);
                                else
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index 83906f80ba..fd33c9cc32 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -126,7 +126,7 @@ static inline void locomokbd_reset_col(unsigned long membase, int col)
 */
 /* Scan the hardware keyboard and push any changes up through the input layer */
-static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *regs)
+static void locomokbd_scankeyboard(struct locomokbd *locomokbd)
 {
        unsigned int row, col, rowd, scancode;
        unsigned long flags;
@@ -135,8 +135,6 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
        spin_lock_irqsave(&locomokbd->lock, flags);
-        input_regs(locomokbd->input, regs);
        locomokbd_charge_all(membase);
        num_pressed = 0;
@@ -171,13 +169,13 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
 /*
 * LoCoMo keyboard interrupt handler.
 */
-static irqreturn_t locomokbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
 {
        struct locomokbd *locomokbd = dev_id;
        /** wait chattering delay **/
        udelay(100);
-        locomokbd_scankeyboard(locomokbd, regs);
+        locomokbd_scankeyboard(locomokbd);
        return IRQ_HANDLED;
 }
diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c
index 40a3f55124..9282e4e082 100644
--- a/drivers/input/keyboard/newtonkbd.c
+++ b/drivers/input/keyboard/newtonkbd.c
@@ -65,13 +65,12 @@ struct nkbd {
 };
 static irqreturn_t nkbd_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct nkbd *nkbd = serio_get_drvdata(serio);
        /* invalid scan codes are probably the init sequence, so we ignore them */
        if (nkbd->keycode[data & NKBD_KEY]) {
-                input_regs(nkbd->dev, regs);
                input_report_key(nkbd->dev, nkbd->keycode[data & NKBD_KEY], data & NKBD_PRESS);
                input_sync(nkbd->dev);
        }
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index d436287d1d..5680a6d95b 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -97,8 +97,7 @@ static u8 get_row_gpio_val(struct omap_kp *omap_kp)
 #define         get_row_gpio_val(x)     0
 #endif
-static irqreturn_t omap_kp_interrupt(int irq, void *dev_id,
+static irqreturn_t omap_kp_interrupt(int irq, void *dev_id)
-                                     struct pt_regs *regs)
 {
        struct omap_kp *omap_kp = dev_id;
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index e385710233..8b18c009e3 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -176,7 +176,7 @@ static inline int spitzkbd_get_row_status(int col)
 */
 /* Scan the hardware keyboard and push any changes up through the input layer */
-static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data, struct pt_regs *regs)
+static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data)
 {
        unsigned int row, col, rowd;
        unsigned long flags;
@@ -187,8 +187,6 @@ static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data, struct pt_regs
        spin_lock_irqsave(&spitzkbd_data->lock, flags);
-        input_regs(spitzkbd_data->input, regs);
        num_pressed = 0;
        for (col = 0; col < KB_COLS; col++) {
                /*
@@ -239,14 +237,14 @@ static void spitzkbd_scankeyboard(struct spitzkbd *spitzkbd_data, struct pt_regs
 /*
 * spitz keyboard interrupt handler.
 */
-static irqreturn_t spitzkbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t spitzkbd_interrupt(int irq, void *dev_id)
 {
        struct spitzkbd *spitzkbd_data = dev_id;
        if (!timer_pending(&spitzkbd_data->timer)) {
                /** wait chattering delay **/
                udelay(20);
-                spitzkbd_scankeyboard(spitzkbd_data, regs);
+                spitzkbd_scankeyboard(spitzkbd_data);
        }
        return IRQ_HANDLED;
@@ -267,7 +265,7 @@ static void spitzkbd_timer_callback(unsigned long data)
 * We debounce the switches and pass them to the input system.
 */
-static irqreturn_t spitzkbd_hinge_isr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t spitzkbd_hinge_isr(int irq, void *dev_id)
 {
        struct spitzkbd *spitzkbd_data = dev_id;
diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c
index 04c54c57f2..e60937d17b 100644
--- a/drivers/input/keyboard/stowaway.c
+++ b/drivers/input/keyboard/stowaway.c
@@ -71,13 +71,12 @@ struct skbd {
 };
 static irqreturn_t skbd_interrupt(struct serio *serio, unsigned char data,
-                                  unsigned int flags, struct pt_regs *regs)
+                                  unsigned int flags)
 {
        struct skbd *skbd = serio_get_drvdata(serio);
        struct input_dev *dev = skbd->dev;
        if (skbd->keycode[data & SKBD_KEY_MASK]) {
-                input_regs(dev, regs);
                input_report_key(dev, skbd->keycode[data & SKBD_KEY_MASK],
                                 !(data & SKBD_RELEASE));
                input_sync(dev);
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index 9dbd7b8568..cac4781103 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -94,7 +94,7 @@ struct sunkbd {
 */
 static irqreturn_t sunkbd_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct sunkbd* sunkbd = serio_get_drvdata(serio);
@@ -129,7 +129,6 @@ static irqreturn_t sunkbd_interrupt(struct serio *serio,
                                break;
                        if (sunkbd->keycode[data & SUNKBD_KEY]) {
-                                input_regs(sunkbd->dev, regs);
                                input_report_key(sunkbd->dev, sunkbd->keycode[data & SUNKBD_KEY], !(data & SUNKBD_RELEASE));
                                input_sync(sunkbd->dev);
                        } else {
diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c
index 0821d53cf0..8c11dc9354 100644
--- a/drivers/input/keyboard/xtkbd.c
+++ b/drivers/input/keyboard/xtkbd.c
@@ -64,7 +64,7 @@ struct xtkbd {
 };
 static irqreturn_t xtkbd_interrupt(struct serio *serio,
-        unsigned char data, unsigned int flags, struct pt_regs *regs)
+        unsigned char data, unsigned int flags)
 {
        struct xtkbd *xtkbd = serio_get_drvdata(serio);
@@ -75,7 +75,6 @@ static irqreturn_t xtkbd_interrupt(struct serio *serio,
                default:
                        if (xtkbd->keycode[data & XTKBD_KEY]) {
-                                input_regs(xtkbd->dev, regs);
                                input_report_key(xtkbd->dev, xtkbd->keycode[data & XTKBD_KEY], !(data & XTKBD_RELEASE));
                                input_sync(xtkbd->dev);
                        } else {
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 805b636e73..105c6fc278 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -79,7 +79,7 @@ static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned
        return 0;
 }
-static irqreturn_t ixp4xx_spkr_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ixp4xx_spkr_interrupt(int irq, void *dev_id)
 {
        /* clear interrupt */
        *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND;
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 450b68a619..4e71a66fc7 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -76,7 +76,7 @@ static const struct alps_model_info alps_model_data[] = {
 * on a dualpoint, etc.
 */
-static void alps_process_packet(struct psmouse *psmouse, struct pt_regs *regs)
+static void alps_process_packet(struct psmouse *psmouse)
 {
        struct alps_data *priv = psmouse->private;
        unsigned char *packet = psmouse->packet;
@@ -85,8 +85,6 @@ static void alps_process_packet(struct psmouse *psmouse, struct pt_regs *regs)
        int x, y, z, ges, fin, left, right, middle;
        int back = 0, forward = 0;
-        input_regs(dev, regs);
        if ((packet[0] & 0xc8) == 0x08) {   /* 3-byte PS/2 packet */
                input_report_key(dev2, BTN_LEFT,   packet[0] & 1);
                input_report_key(dev2, BTN_RIGHT,  packet[0] & 2);
@@ -181,13 +179,13 @@ static void alps_process_packet(struct psmouse *psmouse, struct pt_regs *regs)
        input_sync(dev);
 }
-static psmouse_ret_t alps_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
 {
        struct alps_data *priv = psmouse->private;
        if ((psmouse->packet[0] & 0xc8) == 0x08) { /* PS/2 packet */
                if (psmouse->pktcnt == 3) {
-                        alps_process_packet(psmouse, regs);
+                        alps_process_packet(psmouse);
                        return PSMOUSE_FULL_PACKET;
                }
                return PSMOUSE_GOOD_DATA;
@@ -202,7 +200,7 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse, struct pt_regs *
                return PSMOUSE_BAD_DATA;
        if (psmouse->pktcnt == 6) {
-                alps_process_packet(psmouse, regs);
+                alps_process_packet(psmouse);
                return PSMOUSE_FULL_PACKET;
        }
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index c8b2cc9f18..599a7b2dc5 100644
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
 static int amimouse_lastx, amimouse_lasty;
 static struct input_dev *amimouse_dev;
-static irqreturn_t amimouse_interrupt(int irq, void *dummy, struct pt_regs *fp)
+static irqreturn_t amimouse_interrupt(int irq, void *dummy)
 {
        unsigned short joy0dat, potgor;
        int nx, ny, dx, dy;
@@ -59,8 +59,6 @@ static irqreturn_t amimouse_interrupt(int irq, void *dummy, struct pt_regs *fp)
        potgor = amiga_custom.potgor;
-        input_regs(amimouse_dev, fp);
        input_report_rel(amimouse_dev, REL_X, dx);
        input_report_rel(amimouse_dev, REL_Y, dy);
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index 69f02178c5..402b057e98 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -190,7 +190,7 @@ static void hil_ptr_process_err(struct hil_ptr *ptr) {
 }
 static irqreturn_t hil_ptr_interrupt(struct serio *serio, 
-        unsigned char data, unsigned int flags, struct pt_regs *regs)
+        unsigned char data, unsigned int flags)
 {
        struct hil_ptr *ptr;
        hil_packet packet;
diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c
index 50f1fed10b..e1252fa9a1 100644
--- a/drivers/input/mouse/inport.c
+++ b/drivers/input/mouse/inport.c
@@ -88,15 +88,13 @@ __obsolete_setup("inport_irq=");
 static struct input_dev *inport_dev;
-static irqreturn_t inport_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t inport_interrupt(int irq, void *dev_id)
 {
        unsigned char buttons;
        outb(INPORT_REG_MODE, INPORT_CONTROL_PORT);
        outb(INPORT_MODE_HOLD | INPORT_MODE_IRQ | INPORT_MODE_BASE, INPORT_DATA_PORT);
-        input_regs(inport_dev, regs);
        outb(INPORT_REG_X, INPORT_CONTROL_PORT);
        input_report_rel(inport_dev, REL_X, inb(INPORT_DATA_PORT));
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 5e9d250675..c57e8853b9 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -62,7 +62,7 @@ static struct dmi_system_id lifebook_dmi_table[] = {
 };
-static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
 {
        unsigned char *packet = psmouse->packet;
        struct input_dev *dev = psmouse->dev;
@@ -70,8 +70,6 @@ static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_re
        if (psmouse->pktcnt != 3)
                return PSMOUSE_GOOD_DATA;
-        input_regs(dev, regs);
        /* calculate X and Y */
        if ((packet[0] & 0x08) == 0x00) {
                input_report_abs(dev, ABS_X,
diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c
index 9c7ce38806..8e9c2f3d69 100644
--- a/drivers/input/mouse/logibm.c
+++ b/drivers/input/mouse/logibm.c
@@ -79,7 +79,7 @@ __obsolete_setup("logibm_irq=");
 static struct input_dev *logibm_dev;
-static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t logibm_interrupt(int irq, void *dev_id)
 {
        char dx, dy;
        unsigned char buttons;
@@ -95,7 +95,6 @@ static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        dy |= (buttons & 0xf) << 4;
        buttons = ~buttons >> 5;
-        input_regs(logibm_dev, regs);
        input_report_rel(logibm_dev, REL_X, dx);
        input_report_rel(logibm_dev, REL_Y, dy);
        input_report_key(logibm_dev, BTN_RIGHT,  buttons & 1);
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 7972eecbcf..8a4f862709 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -39,7 +39,7 @@ struct ps2pp_info {
 * Process a PS2++ or PS2T++ packet.
 */
-static psmouse_ret_t ps2pp_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+static psmouse_ret_t ps2pp_process_byte(struct psmouse *psmouse)
 {
        struct input_dev *dev = psmouse->dev;
        unsigned char *packet = psmouse->packet;
@@ -51,8 +51,6 @@ static psmouse_ret_t ps2pp_process_byte(struct psmouse *psmouse, struct pt_regs
 * Full packet accumulated, process it
 */
-        input_regs(dev, regs);
        if ((packet[0] & 0x48) == 0x48 && (packet[1] & 0x02) == 0x02) {
                /* Logitech extended packet */
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c
index d284ea7121..8c075aa722 100644
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
@@ -57,7 +57,7 @@ static struct input_dev *pc110pad_dev;
 static int pc110pad_data[3];
 static int pc110pad_count;
-static irqreturn_t pc110pad_interrupt(int irq, void *ptr, struct pt_regs *regs)
+static irqreturn_t pc110pad_interrupt(int irq, void *ptr)
 {
        int value     = inb_p(pc110pad_io);
        int handshake = inb_p(pc110pad_io + 2);
@@ -71,7 +71,6 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr, struct pt_regs *regs)
        if (pc110pad_count < 3)
                return IRQ_HANDLED;
-        input_regs(pc110pad_dev, regs);
        input_report_key(pc110pad_dev, BTN_TOUCH,
                pc110pad_data[0] & 0x01);
        input_report_abs(pc110pad_dev, ABS_X,
@@ -91,9 +90,9 @@ static void pc110pad_close(struct input_dev *dev)
 static int pc110pad_open(struct input_dev *dev)
 {
-        pc110pad_interrupt(0, NULL, NULL);
+        pc110pad_interrupt(0, NULL);
-        pc110pad_interrupt(0, NULL, NULL);
+        pc110pad_interrupt(0, NULL);
-        pc110pad_interrupt(0, NULL, NULL);
+        pc110pad_interrupt(0, NULL);
        outb(PC110PAD_ON, pc110pad_io + 2);
        pc110pad_count = 0;
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 9fb7eb6b0f..6f9b2c7cc9 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -124,7 +124,7 @@ struct psmouse_protocol {
 * relevant events to the input module once full packet has arrived.
 */
-static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
 {
        struct input_dev *dev = psmouse->dev;
        unsigned char *packet = psmouse->packet;
@@ -136,8 +136,6 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_reg
 * Full packet accumulated, process it
 */
-        input_regs(dev, regs);
 /*
 * Scroll wheel on IntelliMice, scroll buttons on NetMice
 */
@@ -231,9 +229,9 @@ static void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_st
 * by calling corresponding protocol handler.
 */
-static int psmouse_handle_byte(struct psmouse *psmouse, struct pt_regs *regs)
+static int psmouse_handle_byte(struct psmouse *psmouse)
 {
-        psmouse_ret_t rc = psmouse->protocol_handler(psmouse, regs);
+        psmouse_ret_t rc = psmouse->protocol_handler(psmouse);
        switch (rc) {
                case PSMOUSE_BAD_DATA:
@@ -271,7 +269,7 @@ static int psmouse_handle_byte(struct psmouse *psmouse, struct pt_regs *regs)
 */
 static irqreturn_t psmouse_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct psmouse *psmouse = serio_get_drvdata(serio);
@@ -327,7 +325,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
 * Not a new device, try processing first byte normally
 */
                psmouse->pktcnt = 1;
-                if (psmouse_handle_byte(psmouse, regs))
+                if (psmouse_handle_byte(psmouse))
                        goto out;
                psmouse->packet[psmouse->pktcnt++] = data;
@@ -346,7 +344,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
        }
        psmouse->last = jiffies;
-        psmouse_handle_byte(psmouse, regs);
+        psmouse_handle_byte(psmouse);
 out:
        return IRQ_HANDLED;
@@ -940,7 +938,7 @@ static void psmouse_resync(void *p)
                        psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
                        for (i = 0; i < psmouse->pktsize; i++) {
                                psmouse->pktcnt++;
-                                rc = psmouse->protocol_handler(psmouse, NULL);
+                                rc = psmouse->protocol_handler(psmouse);
                                if (rc != PSMOUSE_GOOD_DATA)
                                        break;
                        }
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 4d9107fba6..1b74cae8a5 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -62,7 +62,7 @@ struct psmouse {
        unsigned int resync_time;
        unsigned int smartscroll;       /* Logitech only */
-        psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse, struct pt_regs *regs);
+        psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse);
        void (*set_rate)(struct psmouse *psmouse, unsigned int rate);
        void (*set_resolution)(struct psmouse *psmouse, unsigned int resolution);
diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c
index 872b30bf7a..ea04685696 100644
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
 static short rpcmouse_lastx, rpcmouse_lasty;
 static struct input_dev *rpcmouse_dev;
-static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t rpcmouse_irq(int irq, void *dev_id)
 {
        struct input_dev *dev = dev_id;
        short x, y, dx, dy, b;
@@ -51,8 +51,6 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs)
        rpcmouse_lastx = x;
        rpcmouse_lasty = y;
-        input_regs(dev, regs);
        input_report_rel(dev, REL_X, dx);
        input_report_rel(dev, REL_Y, -dy);
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index 680b323538..2a272c5daf 100644
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -61,13 +61,11 @@ struct sermouse {
 * second, which is as good as a PS/2 or USB mouse.
 */
-static void sermouse_process_msc(struct sermouse *sermouse, signed char data, struct pt_regs *regs)
+static void sermouse_process_msc(struct sermouse *sermouse, signed char data)
 {
        struct input_dev *dev = sermouse->dev;
        signed char *buf = sermouse->buf;
-        input_regs(dev, regs);
        switch (sermouse->count) {
                case 0:
@@ -104,15 +102,13 @@ static void sermouse_process_msc(struct sermouse *sermouse, signed char data, st
 * standard 3-byte packets and 1200 bps.
 */
-static void sermouse_process_ms(struct sermouse *sermouse, signed char data, struct pt_regs *regs)
+static void sermouse_process_ms(struct sermouse *sermouse, signed char data)
 {
        struct input_dev *dev = sermouse->dev;
        signed char *buf = sermouse->buf;
        if (data & 0x40) sermouse->count = 0;
-        input_regs(dev, regs);
        switch (sermouse->count) {
                case 0:
@@ -206,7 +202,7 @@ static void sermouse_process_ms(struct sermouse *sermouse, signed char data, str
 */
 static irqreturn_t sermouse_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct sermouse *sermouse = serio_get_drvdata(serio);
@@ -214,9 +210,9 @@ static irqreturn_t sermouse_interrupt(struct serio *serio,
        sermouse->last = jiffies;
        if (sermouse->type > SERIO_SUN)
-                sermouse_process_ms(sermouse, data, regs);
+                sermouse_process_ms(sermouse, data);
        else
-                sermouse_process_msc(sermouse, data, regs);
+                sermouse_process_msc(sermouse, data);
        return IRQ_HANDLED;
 }
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 392108c436..49ac696d6c 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -216,13 +216,13 @@ static void synaptics_pass_pt_packet(struct serio *ptport, unsigned char *packet
        struct psmouse *child = serio_get_drvdata(ptport);
        if (child && child->state == PSMOUSE_ACTIVATED) {
-                serio_interrupt(ptport, packet[1], 0, NULL);
+                serio_interrupt(ptport, packet[1], 0);
-                serio_interrupt(ptport, packet[4], 0, NULL);
+                serio_interrupt(ptport, packet[4], 0);
-                serio_interrupt(ptport, packet[5], 0, NULL);
+                serio_interrupt(ptport, packet[5], 0);
                if (child->pktsize == 4)
-                        serio_interrupt(ptport, packet[2], 0, NULL);
+                        serio_interrupt(ptport, packet[2], 0);
        } else
-                serio_interrupt(ptport, packet[1], 0, NULL);
+                serio_interrupt(ptport, packet[1], 0);
 }
 static void synaptics_pt_activate(struct psmouse *psmouse)
@@ -469,13 +469,10 @@ static unsigned char synaptics_detect_pkt_type(struct psmouse *psmouse)
        return SYN_NEWABS_STRICT;
 }
-static psmouse_ret_t synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+static psmouse_ret_t synaptics_process_byte(struct psmouse *psmouse)
 {
-        struct input_dev *dev = psmouse->dev;
        struct synaptics_data *priv = psmouse->private;
-        input_regs(dev, regs);
        if (psmouse->pktcnt >= 6) { /* Full packet received */
                if (unlikely(priv->pkt_type == SYN_NEWABS))
                        priv->pkt_type = synaptics_detect_pkt_type(psmouse);
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index 47edcfd022..ffdb50eee9 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -211,7 +211,7 @@ vsxxxaa_smells_like_packet (struct vsxxxaa *mouse, unsigned char type, size_t le
 }
 static void
-vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
+vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse)
 {
        struct input_dev *dev = mouse->dev;
        unsigned char *buf = mouse->buf;
@@ -258,7 +258,6 @@ vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
        /*
         * Report what we've found so far...
         */
-        input_regs (dev, regs);
        input_report_key (dev, BTN_LEFT, left);
        input_report_key (dev, BTN_MIDDLE, middle);
        input_report_key (dev, BTN_RIGHT, right);
@@ -269,7 +268,7 @@ vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
 }
 static void
-vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
+vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse)
 {
        struct input_dev *dev = mouse->dev;
        unsigned char *buf = mouse->buf;
@@ -312,7 +311,6 @@ vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
        /*
         * Report what we've found so far...
         */
-        input_regs (dev, regs);
        input_report_key (dev, BTN_LEFT, left);
        input_report_key (dev, BTN_MIDDLE, middle);
        input_report_key (dev, BTN_RIGHT, right);
@@ -323,7 +321,7 @@ vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
 }
 static void
-vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
+vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
 {
        struct input_dev *dev = mouse->dev;
        unsigned char *buf = mouse->buf;
@@ -367,7 +365,6 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
        if (error <= 0x1f) {
                /* No (serious) error. Report buttons */
-                input_regs (dev, regs);
                input_report_key (dev, BTN_LEFT, left);
                input_report_key (dev, BTN_MIDDLE, middle);
                input_report_key (dev, BTN_RIGHT, right);
@@ -395,7 +392,7 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
 }
 static void
-vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs)
+vsxxxaa_parse_buffer (struct vsxxxaa *mouse)
 {
        unsigned char *buf = mouse->buf;
        int stray_bytes;
@@ -432,7 +429,7 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs)
                                continue;
                        }
-                        vsxxxaa_handle_REL_packet (mouse, regs);
+                        vsxxxaa_handle_REL_packet (mouse);
                        continue; /* More to parse? */
                }
@@ -446,7 +443,7 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs)
                                continue;
                        }
-                        vsxxxaa_handle_ABS_packet (mouse, regs);
+                        vsxxxaa_handle_ABS_packet (mouse);
                        continue; /* More to parse? */
                }
@@ -460,7 +457,7 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs)
                                continue;
                        }
-                        vsxxxaa_handle_POR_packet (mouse, regs);
+                        vsxxxaa_handle_POR_packet (mouse);
                        continue; /* More to parse? */
                }
@@ -469,13 +466,12 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs)
 }
 static irqreturn_t
-vsxxxaa_interrupt (struct serio *serio, unsigned char data, unsigned int flags,
+vsxxxaa_interrupt (struct serio *serio, unsigned char data, unsigned int flags)
-                struct pt_regs *regs)
 {
        struct vsxxxaa *mouse = serio_get_drvdata (serio);
        vsxxxaa_queue_byte (mouse, data);
-        vsxxxaa_parse_buffer (mouse, regs);
+        vsxxxaa_parse_buffer (mouse);
        return IRQ_HANDLED;
 }
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 3df5eedf8f..5a7b49c355 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -37,14 +37,14 @@ struct amba_kmi_port {
        unsigned int            open;
 };
-static irqreturn_t amba_kmi_int(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t amba_kmi_int(int irq, void *dev_id)
 {
        struct amba_kmi_port *kmi = dev_id;
        unsigned int status = readb(KMIIR);
        int handled = IRQ_NONE;
        while (status & KMIIR_RXINTR) {
-                serio_interrupt(kmi->io, readb(KMIDATA), 0, regs);
+                serio_interrupt(kmi->io, readb(KMIDATA), 0);
                status = readb(KMIIR);
                handled = IRQ_HANDLED;
        }
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index bc6e87add0..0d35018c23 100644
--- a/drivers/input/serio/ct82c710.c
+++ b/drivers/input/serio/ct82c710.c
@@ -71,9 +71,9 @@ static struct resource ct82c710_iores;
 * is waiting in the 82C710.
 */
-static irqreturn_t ct82c710_interrupt(int cpl, void *dev_id, struct pt_regs * regs)
+static irqreturn_t ct82c710_interrupt(int cpl, void *dev_id)
 {
-        return serio_interrupt(ct82c710_port, inb(CT82C710_DATA), 0, regs);
+        return serio_interrupt(ct82c710_port, inb(CT82C710_DATA), 0);
 }
 /*
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index cde036a921..081fdc3c77 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -82,7 +82,7 @@ MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);
 #define GSC_ID_MOUSE            1
-static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs);
+static irqreturn_t gscps2_interrupt(int irq, void *dev);
 #define BUFFER_SIZE 0x0f
@@ -226,7 +226,7 @@ static LIST_HEAD(ps2port_list);
 * later.
 */
-static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t gscps2_interrupt(int irq, void *dev)
 {
        struct gscps2port *ps2port;
@@ -267,7 +267,7 @@ static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs)
            rxflags =   ((status & GSC_STAT_TERR) ? SERIO_TIMEOUT : 0 ) |
                        ((status & GSC_STAT_PERR) ? SERIO_PARITY  : 0 );
-            serio_interrupt(ps2port->port, data, rxflags, regs);
+            serio_interrupt(ps2port->port, data, rxflags);
          } /* while() */
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index a10348bb25..ba7b920347 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -202,7 +202,7 @@ static void hp_sdc_take (int irq, void *dev_id, uint8_t status, uint8_t data) {
        }
 }
-static irqreturn_t hp_sdc_isr(int irq, void *dev_id, struct pt_regs * regs) {
+static irqreturn_t hp_sdc_isr(int irq, void *dev_id) {
        uint8_t status, data;
        status = hp_sdc_status_in8();
@@ -253,7 +253,7 @@ static irqreturn_t hp_sdc_isr(int irq, void *dev_id, struct pt_regs * regs) {
 }
-static irqreturn_t hp_sdc_nmisr(int irq, void *dev_id, struct pt_regs * regs) {
+static irqreturn_t hp_sdc_nmisr(int irq, void *dev_id) {
        int status;
        
        status = hp_sdc_status_in8();
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 1bb0c76a92..09b06e605b 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -108,7 +108,7 @@ static unsigned char i8042_kbd_irq_registered;
 static unsigned char i8042_aux_irq_registered;
 static struct platform_device *i8042_platform_device;
-static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t i8042_interrupt(int irq, void *dev_id);
 /*
 * The i8042_wait_read() and i8042_wait_write functions wait for the i8042 to
@@ -271,7 +271,7 @@ static int i8042_aux_write(struct serio *serio, unsigned char c)
 * characters later.
 */
-        i8042_interrupt(0, NULL, NULL);
+        i8042_interrupt(0, NULL);
        return retval;
 }
@@ -309,7 +309,7 @@ static void i8042_stop(struct serio *serio)
 * to the upper layers.
 */
-static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t i8042_interrupt(int irq, void *dev_id)
 {
        struct i8042_port *port;
        unsigned long flags;
@@ -379,7 +379,7 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs)
            dfl & SERIO_TIMEOUT ? ", timeout" : "");
        if (likely(port->exists))
-                serio_interrupt(port->serio, data, dfl, regs);
+                serio_interrupt(port->serio, data, dfl);
        ret = 1;
 out:
@@ -519,7 +519,7 @@ static int __devinit i8042_check_mux(void)
 static struct completion i8042_aux_irq_delivered __devinitdata;
 static int i8042_irq_being_tested __devinitdata;
-static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 {
        unsigned long flags;
        unsigned char str, data;
@@ -905,7 +905,7 @@ static int i8042_resume(struct platform_device *dev)
        if (i8042_ports[I8042_KBD_PORT_NO].serio)
                i8042_enable_kbd_port();
-        i8042_interrupt(0, NULL, NULL);
+        i8042_interrupt(0, NULL);
        return 0;
 }
diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index f08a5d0cd5..558200e96d 100644
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -72,8 +72,7 @@ static int maceps2_write(struct serio *dev, unsigned char val)
        return -1;
 }
-static irqreturn_t maceps2_interrupt(int irq, void *dev_id,
+static irqreturn_t maceps2_interrupt(int irq, void *dev_id)
-                                     struct pt_regs *regs)
 {
        struct serio *dev = dev_id;
        struct mace_ps2port *port = ((struct maceps2_data *)dev->port_data)->port;
@@ -81,7 +80,7 @@ static irqreturn_t maceps2_interrupt(int irq, void *dev_id,
        if (port->status & PS2_STATUS_RX_FULL) {
                byte = port->rx;
-                serio_interrupt(dev, byte & 0xff, 0, regs);
+                serio_interrupt(dev, byte & 0xff, 0);
        }
        return IRQ_HANDLED;
diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c
index a5c1fb3a4a..688610e86a 100644
--- a/drivers/input/serio/parkbd.c
+++ b/drivers/input/serio/parkbd.c
@@ -102,7 +102,7 @@ static int parkbd_write(struct serio *port, unsigned char c)
        return 0;
 }
-static void parkbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static void parkbd_interrupt(int irq, void *dev_id)
 {
        if (parkbd_writing) {
@@ -134,7 +134,7 @@ static void parkbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                parkbd_buffer |= (parkbd_readlines() >> 1) << parkbd_counter++;
                if (parkbd_counter == parkbd_mode + 10)
-                        serio_interrupt(parkbd_port, (parkbd_buffer >> (2 - parkbd_mode)) & 0xff, 0, regs);
+                        serio_interrupt(parkbd_port, (parkbd_buffer >> (2 - parkbd_mode)) & 0xff, 0);
        }
        parkbd_last = jiffies;
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index fb727c6652..ea5e3c6ddb 100644
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -58,7 +58,7 @@ static int pcips2_write(struct serio *io, unsigned char val)
        return 0;
 }
-static irqreturn_t pcips2_interrupt(int irq, void *devid, struct pt_regs *regs)
+static irqreturn_t pcips2_interrupt(int irq, void *devid)
 {
        struct pcips2_data *ps2if = devid;
        unsigned char status, scancode;
@@ -80,7 +80,7 @@ static irqreturn_t pcips2_interrupt(int irq, void *devid, struct pt_regs *regs)
                if (hweight8(scancode) & 1)
                        flag ^= SERIO_PARITY;
-                serio_interrupt(ps2if->io, scancode, flag, regs);
+                serio_interrupt(ps2if->io, scancode, flag);
        } while (1);
        return IRQ_RETVAL(handled);
 }
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index d3827c5fe1..cb89aff2e1 100644
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -53,14 +53,14 @@ DEFINE_SPINLOCK(q40kbd_lock);
 static struct serio *q40kbd_port;
 static struct platform_device *q40kbd_device;
-static irqreturn_t q40kbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t q40kbd_interrupt(int irq, void *dev_id)
 {
        unsigned long flags;
        spin_lock_irqsave(&q40kbd_lock, flags);
        if (Q40_IRQ_KEYB_MASK & master_inb(INTERRUPT_REG))
-                serio_interrupt(q40kbd_port, master_inb(KEYCODE_REG), 0, regs);
+                serio_interrupt(q40kbd_port, master_inb(KEYCODE_REG), 0);
        master_outb(-1, KEYBOARD_UNLOCK_REG);
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 513d37fc1a..49f84315cb 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -56,7 +56,7 @@ static int rpckbd_write(struct serio *port, unsigned char val)
        return 0;
 }
-static irqreturn_t rpckbd_rx(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t rpckbd_rx(int irq, void *dev_id)
 {
        struct serio *port = dev_id;
        unsigned int byte;
@@ -65,13 +65,13 @@ static irqreturn_t rpckbd_rx(int irq, void *dev_id, struct pt_regs *regs)
        while (iomd_readb(IOMD_KCTRL) & (1 << 5)) {
                byte = iomd_readb(IOMD_KARTRX);
-                serio_interrupt(port, byte, 0, regs);
+                serio_interrupt(port, byte, 0);
                handled = IRQ_HANDLED;
        }
        return handled;
 }
-static irqreturn_t rpckbd_tx(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t rpckbd_tx(int irq, void *dev_id)
 {
        return IRQ_HANDLED;
 }
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index ebd9976fc8..559508795a 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -40,7 +40,7 @@ struct ps2if {
 * at the most one, but we loop for safety.  If there was a
 * framing error, we have to manually clear the status.
 */
-static irqreturn_t ps2_rxint(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ps2_rxint(int irq, void *dev_id)
 {
        struct ps2if *ps2if = dev_id;
        unsigned int scancode, flag, status;
@@ -58,7 +58,7 @@ static irqreturn_t ps2_rxint(int irq, void *dev_id, struct pt_regs *regs)
                if (hweight8(scancode) & 1)
                        flag ^= SERIO_PARITY;
-                serio_interrupt(ps2if->io, scancode, flag, regs);
+                serio_interrupt(ps2if->io, scancode, flag);
                status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
        }
@@ -69,7 +69,7 @@ static irqreturn_t ps2_rxint(int irq, void *dev_id, struct pt_regs *regs)
 /*
 * Completion of ps2 write
 */
-static irqreturn_t ps2_txint(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ps2_txint(int irq, void *dev_id)
 {
        struct ps2if *ps2if = dev_id;
        unsigned int status;
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 3e76ad71c9..960fae3c3c 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -911,7 +911,7 @@ void serio_close(struct serio *serio)
 }
 irqreturn_t serio_interrupt(struct serio *serio,
-                unsigned char data, unsigned int dfl, struct pt_regs *regs)
+                unsigned char data, unsigned int dfl)
 {
        unsigned long flags;
        irqreturn_t ret = IRQ_NONE;
@@ -919,7 +919,7 @@ irqreturn_t serio_interrupt(struct serio *serio,
        spin_lock_irqsave(&serio->lock, flags);
        if (likely(serio->drv)) {
-                ret = serio->drv->interrupt(serio, data, dfl, regs);
+                ret = serio->drv->interrupt(serio, data, dfl);
        } else if (!dfl && serio->registered) {
                serio_rescan(serio);
                ret = IRQ_HANDLED;
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 71a8eea816..ba2a2035d6 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -250,7 +250,7 @@ static struct file_operations serio_raw_fops = {
 *********************************************************************/
 static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
-                                        unsigned int dfl, struct pt_regs *regs)
+                                        unsigned int dfl)
 {
        struct serio_raw *serio_raw = serio_get_drvdata(serio);
        struct serio_raw_list *list;
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 54a680cc70..e1a3a79ab3 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -117,9 +117,6 @@ static void serport_ldisc_close(struct tty_struct *tty)
 * serport_ldisc_receive() is called by the low level tty driver when characters
 * are ready for us. We forward the characters, one by one to the 'interrupt'
 * routine.
- *
- * FIXME: We should get pt_regs from the tty layer and forward them to
- *        serio_interrupt here.
 */
 static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *cp, char *fp, int count)
@@ -134,7 +131,7 @@ static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *c
                goto out;
        for (i = 0; i < count; i++)
-                serio_interrupt(serport->serio, cp[i], 0, NULL);
+                serio_interrupt(serport->serio, cp[i], 0);
 out:
        spin_unlock_irqrestore(&serport->lock, flags);
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 66e411badf..f56d6a0f06 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -487,7 +487,7 @@ static void ads7846_timer(unsigned long handle)
        spin_unlock_irq(&ts->lock);
 }
-static irqreturn_t ads7846_irq(int irq, void *handle, struct pt_regs *regs)
+static irqreturn_t ads7846_irq(int irq, void *handle)
 {
        struct ads7846 *ts = handle;
        unsigned long flags;
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 9b66271d3b..ca79b22461 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -173,7 +173,7 @@ static int read_xydata(struct corgi_ts *corgi_ts)
        return 1;
 }
-static void new_data(struct corgi_ts *corgi_ts, struct pt_regs *regs)
+static void new_data(struct corgi_ts *corgi_ts)
 {
        if (corgi_ts->power_mode != PWR_MODE_ACTIVE)
                return;
@@ -181,7 +181,6 @@ static void new_data(struct corgi_ts *corgi_ts, struct pt_regs *regs)
        if (!corgi_ts->tc.pressure && corgi_ts->pendown == 0)
                return;
-        input_regs(corgi_ts->input, regs);
        input_report_abs(corgi_ts->input, ABS_X, corgi_ts->tc.x);
        input_report_abs(corgi_ts->input, ABS_Y, corgi_ts->tc.y);
        input_report_abs(corgi_ts->input, ABS_PRESSURE, corgi_ts->tc.pressure);
@@ -189,14 +188,14 @@ static void new_data(struct corgi_ts *corgi_ts, struct pt_regs *regs)
        input_sync(corgi_ts->input);
 }
-static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer, struct pt_regs *regs)
+static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
 {
        if ((GPLR(IRQ_TO_GPIO(corgi_ts->irq_gpio)) & GPIO_bit(IRQ_TO_GPIO(corgi_ts->irq_gpio))) == 0) {
                /* Disable Interrupt */
                set_irq_type(corgi_ts->irq_gpio, IRQT_NOEDGE);
                if (read_xydata(corgi_ts)) {
                        corgi_ts->pendown = 1;
-                        new_data(corgi_ts, regs);
+                        new_data(corgi_ts);
                }
                mod_timer(&corgi_ts->timer, jiffies + HZ / 100);
        } else {
@@ -208,7 +207,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer, struct pt_
                if (corgi_ts->pendown) {
                        corgi_ts->tc.pressure = 0;
-                        new_data(corgi_ts, regs);
+                        new_data(corgi_ts);
                }
                /* Enable Falling Edge */
@@ -223,10 +222,10 @@ static void corgi_ts_timer(unsigned long data)
        ts_interrupt_main(corgits_data, 1, NULL);
 }
-static irqreturn_t ts_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ts_interrupt(int irq, void *dev_id)
 {
        struct corgi_ts *corgits_data = dev_id;
-        ts_interrupt_main(corgits_data, 0, regs);
+        ts_interrupt_main(corgits_data, 0);
        return IRQ_HANDLED;
 }
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index ab565335ee..913e1b73bb 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -67,7 +67,7 @@ struct elo {
        char phys[32];
 };
-static void elo_process_data_10(struct elo *elo, unsigned char data, struct pt_regs *regs)
+static void elo_process_data_10(struct elo *elo, unsigned char data)
 {
        struct input_dev *dev = elo->dev;
@@ -95,7 +95,6 @@ static void elo_process_data_10(struct elo *elo, unsigned char data, struct pt_r
                                break;
                        }
                        if (likely(elo->data[1] == ELO10_TOUCH_PACKET)) {
-                                input_regs(dev, regs);
                                input_report_abs(dev, ABS_X, (elo->data[4] << 8) | elo->data[3]);
                                input_report_abs(dev, ABS_Y, (elo->data[6] << 8) | elo->data[5]);
                                if (elo->data[2] & ELO10_PRESSURE)
@@ -116,7 +115,7 @@ static void elo_process_data_10(struct elo *elo, unsigned char data, struct pt_r
        elo->csum += data;
 }
-static void elo_process_data_6(struct elo *elo, unsigned char data, struct pt_regs *regs)
+static void elo_process_data_6(struct elo *elo, unsigned char data)
 {
        struct input_dev *dev = elo->dev;
@@ -134,7 +133,6 @@ static void elo_process_data_6(struct elo *elo, unsigned char data, struct pt_re
                                break;
                        }
-                        input_regs(dev, regs);
                        input_report_abs(dev, ABS_X, ((elo->data[0] & 0x3f) << 6) | (elo->data[1] & 0x3f));
                        input_report_abs(dev, ABS_Y, ((elo->data[2] & 0x3f) << 6) | (elo->data[3] & 0x3f));
@@ -164,7 +162,7 @@ static void elo_process_data_6(struct elo *elo, unsigned char data, struct pt_re
        }
 }
-static void elo_process_data_3(struct elo *elo, unsigned char data, struct pt_regs *regs)
+static void elo_process_data_3(struct elo *elo, unsigned char data)
 {
        struct input_dev *dev = elo->dev;
@@ -177,7 +175,6 @@ static void elo_process_data_3(struct elo *elo, unsigned char data, struct pt_re
                                elo->idx = 0;
                        break;
                case 2:
-                        input_regs(dev, regs);
                        input_report_key(dev, BTN_TOUCH, !(elo->data[1] & 0x80));
                        input_report_abs(dev, ABS_X, elo->data[1]);
                        input_report_abs(dev, ABS_Y, elo->data[2]);
@@ -188,22 +185,22 @@ static void elo_process_data_3(struct elo *elo, unsigned char data, struct pt_re
 }
 static irqreturn_t elo_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct elo *elo = serio_get_drvdata(serio);
        switch(elo->id) {
                case 0:
-                        elo_process_data_10(elo, data, regs);
+                        elo_process_data_10(elo, data);
                        break;
                case 1:
                case 2:
-                        elo_process_data_6(elo, data, regs);
+                        elo_process_data_6(elo, data);
                        break;
                case 3:
-                        elo_process_data_3(elo, data, regs);
+                        elo_process_data_3(elo, data);
                        break;
        }
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index b769b21973..817c219893 100644
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -60,7 +60,7 @@ struct gunze {
        char phys[32];
 };
-static void gunze_process_packet(struct gunze* gunze, struct pt_regs *regs)
+static void gunze_process_packet(struct gunze* gunze)
 {
        struct input_dev *dev = gunze->dev;
@@ -70,7 +70,6 @@ static void gunze_process_packet(struct gunze* gunze, struct pt_regs *regs)
                return;
        }
-        input_regs(dev, regs);
        input_report_abs(dev, ABS_X, simple_strtoul(gunze->data + 1, NULL, 10));
        input_report_abs(dev, ABS_Y, 1024 - simple_strtoul(gunze->data + 6, NULL, 10));
        input_report_key(dev, BTN_TOUCH, gunze->data[0] == 'T');
@@ -78,12 +77,12 @@ static void gunze_process_packet(struct gunze* gunze, struct pt_regs *regs)
 }
 static irqreturn_t gunze_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct gunze* gunze = serio_get_drvdata(serio);
        if (data == '\r') {
-                gunze_process_packet(gunze, regs);
+                gunze_process_packet(gunze);
                gunze->idx = 0;
        } else {
                if (gunze->idx < GUNZE_MAX_LENGTH)
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index e2b9100187..d9e61ee05e 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -106,19 +106,18 @@ struct h3600_dev {
        char phys[32];
 };
-static irqreturn_t action_button_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t action_button_handler(int irq, void *dev_id)
 {
        int down = (GPLR & GPIO_BITSY_ACTION_BUTTON) ? 0 : 1;
        struct input_dev *dev = (struct input_dev *) dev_id;
-        input_regs(dev, regs);
        input_report_key(dev, KEY_ENTER, down);
        input_sync(dev);
        return IRQ_HANDLED;
 }
-static irqreturn_t npower_button_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t npower_button_handler(int irq, void *dev_id)
 {
        int down = (GPLR & GPIO_BITSY_NPOWER_BUTTON) ? 0 : 1;
        struct input_dev *dev = (struct input_dev *) dev_id;
@@ -127,7 +126,6 @@ static irqreturn_t npower_button_handler(int irq, void *dev_id, struct pt_regs *
         * This interrupt is only called when we release the key. So we have
         * to fake a key press.
         */
-        input_regs(dev, regs);
        input_report_key(dev, KEY_SUSPEND, 1);
        input_report_key(dev, KEY_SUSPEND, down);
        input_sync(dev);
@@ -165,14 +163,12 @@ unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr)
 * packets. Some packets coming from serial are not touchscreen related. In
 * this case we send them off to be processed elsewhere.
 */
-static void h3600ts_process_packet(struct h3600_dev *ts, struct pt_regs *regs)
+static void h3600ts_process_packet(struct h3600_dev *ts)
 {
        struct input_dev *dev = ts->dev;
        static int touched = 0;
        int key, down = 0;
-        input_regs(dev, regs);
        switch (ts->event) {
                /*
                   Buttons - returned as a single byte
@@ -301,7 +297,7 @@ static int state;
 #define STATE_EOF       3       /* state where we decode checksum or EOF */
 static irqreturn_t h3600ts_interrupt(struct serio *serio, unsigned char data,
-                                     unsigned int flags, struct pt_regs *regs)
+                                     unsigned int flags)
 {
        struct h3600_dev *ts = serio_get_drvdata(serio);
@@ -333,7 +329,7 @@ static irqreturn_t h3600ts_interrupt(struct serio *serio, unsigned char data,
                case STATE_EOF:
                        state = STATE_SOF;
                        if (data == CHAR_EOF || data == ts->chksum)
-                                h3600ts_process_packet(ts, regs);
+                                h3600ts_process_packet(ts);
                        break;
                default:
                        printk("Error3\n");
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index ee6c2f40cd..e31c6c55b2 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -66,7 +66,7 @@ static void do_softint(void *data)
        enable_irq(HP680_TS_IRQ);
 }
-static irqreturn_t hp680_ts_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t hp680_ts_interrupt(int irq, void *dev)
 {
        disable_irq_nosync(irq);
        schedule_delayed_work(&work, HZ / 20);
diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c
index 3226830eea..4cbcaa6a71 100644
--- a/drivers/input/touchscreen/mk712.c
+++ b/drivers/input/touchscreen/mk712.c
@@ -80,7 +80,7 @@ MODULE_PARM_DESC(irq, "IRQ of MK712 touchscreen controller");
 static struct input_dev *mk712_dev;
 static DEFINE_SPINLOCK(mk712_lock);
-static irqreturn_t mk712_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t mk712_interrupt(int irq, void *dev_id)
 {
        unsigned char status;
        static int debounce = 1;
@@ -88,7 +88,6 @@ static irqreturn_t mk712_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        static unsigned short last_y;
        spin_lock(&mk712_lock);
-        input_regs(mk712_dev, regs);
        status = inb(mk712_io + MK712_STATUS);
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c
index 8647a905df..3b4c61664b 100644
--- a/drivers/input/touchscreen/mtouch.c
+++ b/drivers/input/touchscreen/mtouch.c
@@ -63,12 +63,11 @@ struct mtouch {
        char phys[32];
 };
-static void mtouch_process_format_tablet(struct mtouch *mtouch, struct pt_regs *regs)
+static void mtouch_process_format_tablet(struct mtouch *mtouch)
 {
        struct input_dev *dev = mtouch->dev;
        if (MTOUCH_FORMAT_TABLET_LENGTH == ++mtouch->idx) {
-                input_regs(dev, regs);
                input_report_abs(dev, ABS_X, MTOUCH_GET_XC(mtouch->data));
                input_report_abs(dev, ABS_Y, MTOUCH_MAX_YC - MTOUCH_GET_YC(mtouch->data));
                input_report_key(dev, BTN_TOUCH, MTOUCH_GET_TOUCHED(mtouch->data));
@@ -78,7 +77,7 @@ static void mtouch_process_format_tablet(struct mtouch *mtouch, struct pt_regs *
        }
 }
-static void mtouch_process_response(struct mtouch *mtouch, struct pt_regs *regs)
+static void mtouch_process_response(struct mtouch *mtouch)
 {
        if (MTOUCH_RESPONSE_END_BYTE == mtouch->data[mtouch->idx++]) {
                /* FIXME - process response */
@@ -90,16 +89,16 @@ static void mtouch_process_response(struct mtouch *mtouch, struct pt_regs *regs)
 }
 static irqreturn_t mtouch_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct mtouch* mtouch = serio_get_drvdata(serio);
        mtouch->data[mtouch->idx] = data;
        if (MTOUCH_FORMAT_TABLET_STATUS_BIT & mtouch->data[0])
-                mtouch_process_format_tablet(mtouch, regs);
+                mtouch_process_format_tablet(mtouch);
        else if (MTOUCH_RESPONSE_BEGIN_BYTE == mtouch->data[0])
-                mtouch_process_response(mtouch, regs);
+                mtouch_process_response(mtouch);
        else
                printk(KERN_DEBUG "mtouch.c: unknown/unsynchronized data from device, byte %x\n",mtouch->data[0]);
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index f7370109d4..6c7d0c2c76 100644
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -46,7 +46,7 @@ struct pm {
 };
 static irqreturn_t pm_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct pm *pm = serio_get_drvdata(serio);
        struct input_dev *dev = pm->dev;
@@ -55,7 +55,6 @@ static irqreturn_t pm_interrupt(struct serio *serio,
        if (pm->data[0] & 0x80) {
                if (PM_MAX_LENGTH == ++pm->idx) {
-                        input_regs(dev, regs);
                        input_report_abs(dev, ABS_X, pm->data[2] * 128 + pm->data[1]);
                        input_report_abs(dev, ABS_Y, pm->data[4] * 128 + pm->data[3]);
                        input_report_key(dev, BTN_TOUCH, !!(pm->data[0] & 0x40));
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c
index 1c89fa5386..c74f74e57a 100644
--- a/drivers/input/touchscreen/touchright.c
+++ b/drivers/input/touchscreen/touchright.c
@@ -56,7 +56,7 @@ struct tr {
 };
 static irqreturn_t tr_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct tr *tr = serio_get_drvdata(serio);
        struct input_dev *dev = tr->dev;
@@ -65,7 +65,6 @@ static irqreturn_t tr_interrupt(struct serio *serio,
        if ((tr->data[0] & TR_FORMAT_STATUS_MASK) == TR_FORMAT_STATUS_BYTE) {
                if (++tr->idx == TR_LENGTH) {
-                        input_regs(dev, regs);
                        input_report_abs(dev, ABS_X,
                                (tr->data[1] << 5) | (tr->data[2] >> 1));
                        input_report_abs(dev, ABS_Y,
diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c
index a7b4c75595..9911820fa2 100644
--- a/drivers/input/touchscreen/touchwin.c
+++ b/drivers/input/touchscreen/touchwin.c
@@ -60,7 +60,7 @@ struct tw {
 };
 static irqreturn_t tw_interrupt(struct serio *serio,
-                unsigned char data, unsigned int flags, struct pt_regs *regs)
+                unsigned char data, unsigned int flags)
 {
        struct tw *tw = serio_get_drvdata(serio);
        struct input_dev *dev = tw->dev;
@@ -70,7 +70,6 @@ static irqreturn_t tw_interrupt(struct serio *serio,
                tw->data[tw->idx++] = data;
                /* verify length and that the two Y's are the same */
                if (tw->idx == TW_LENGTH && tw->data[1] == tw->data[2]) {
-                        input_regs(dev, regs);
                        input_report_abs(dev, ABS_X, tw->data[0]);
                        input_report_abs(dev, ABS_Y, tw->data[1]);
                        input_report_key(dev, BTN_TOUCH, 1);