Patched in Tegra support.

27 files changed, 327 insertions, 133 deletions

diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index 85bc8dc07cf..1639ab2b94b 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -413,4 +413,15 @@ static struct gameport_driver a3d_drv = {
         .disconnect     = a3d_disconnect,
 };
 
-module_gameport_driver(a3d_drv);
+static int __init a3d_init(void)
+{
+        return gameport_register_driver(&a3d_drv);
+}
+
+static void __exit a3d_exit(void)
+{
+        gameport_unregister_driver(&a3d_drv);
+}
+
+module_init(a3d_init);
+module_exit(a3d_exit);
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 0cbfd2dfabf..b992fbf91f2 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -557,6 +557,10 @@ static void adi_disconnect(struct gameport *gameport)
         kfree(port);
 }
 
+/*
+ * The gameport device structure.
+ */
+
 static struct gameport_driver adi_drv = {
         .driver         = {
                 .name   = "adi",
@@ -566,4 +570,15 @@ static struct gameport_driver adi_drv = {
         .disconnect     = adi_disconnect,
 };
 
-module_gameport_driver(adi_drv);
+static int __init adi_init(void)
+{
+        return gameport_register_driver(&adi_drv);
+}
+
+static void __exit adi_exit(void)
+{
+        gameport_unregister_driver(&adi_drv);
+}
+
+module_init(adi_init);
+module_exit(adi_exit);
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index c65b5fa69f1..0bc86204213 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -35,6 +35,7 @@
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 
+#include <asm/system.h>
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
 
@@ -107,9 +108,6 @@ static int __init amijoy_init(void)
         int i, j;
         int err;
 
-        if (!MACH_IS_AMIGA)
-                return -ENODEV;
-
         for (i = 0; i < 2; i++) {
                 if (!amijoy[i])
                         continue;
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 121cd63d333..f6732b57ca0 100644
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -30,7 +30,6 @@
 #include <linux/delay.h>
 #include <linux/input/as5011.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 
 #define DRIVER_DESC "Driver for Austria Microsystems AS5011 joystick"
 #define MODULE_DEVICE_ALIAS "as5011"
@@ -85,10 +84,7 @@ static int as5011_i2c_write(struct i2c_client *client,
 {
         uint8_t data[2] = { aregaddr, avalue };
         struct i2c_msg msg = {
-                .addr = client->addr,
-                .flags = I2C_M_IGNORE_NAK,
-                .len = 2,
-                .buf = (uint8_t *)data
+                client->addr, I2C_M_IGNORE_NAK, 2, (uint8_t *)data
         };
         int error;
 
@@ -101,18 +97,8 @@ static int as5011_i2c_read(struct i2c_client *client,
 {
         uint8_t data[2] = { aregaddr };
         struct i2c_msg msg_set[2] = {
-                {
-                        .addr = client->addr,
-                        .flags = I2C_M_REV_DIR_ADDR,
-                        .len = 1,
-                        .buf = (uint8_t *)data
-                },
-                {
-                        .addr = client->addr,
-                        .flags = I2C_M_RD | I2C_M_NOSTART,
-                        .len = 1,
-                        .buf = (uint8_t *)data
-                }
+                { client->addr, I2C_M_REV_DIR_ADDR, 1, (uint8_t *)data },
+                { client->addr, I2C_M_RD | I2C_M_NOSTART, 1, (uint8_t *)data }
         };
         int error;
 
@@ -157,7 +143,7 @@ out:
         return IRQ_HANDLED;
 }
 
-static int as5011_configure_chip(struct as5011_device *as5011,
+static int __devinit as5011_configure_chip(struct as5011_device *as5011,
                                 const struct as5011_platform_data *plat_dat)
 {
         struct i2c_client *client = as5011->i2c_client;
@@ -225,8 +211,8 @@ static int as5011_configure_chip(struct as5011_device *as5011,
         return 0;
 }
 
-static int as5011_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int __devinit as5011_probe(struct i2c_client *client,
+                                const struct i2c_device_id *id)
 {
         const struct as5011_platform_data *plat_data;
         struct as5011_device *as5011;
@@ -244,7 +230,6 @@ static int as5011_probe(struct i2c_client *client,
         }
 
         if (!i2c_check_functionality(client->adapter,
-                                     I2C_FUNC_NOSTART |
                                      I2C_FUNC_PROTOCOL_MANGLING)) {
                 dev_err(&client->dev,
                         "need i2c bus that supports protocol mangling\n");
@@ -295,8 +280,7 @@ static int as5011_probe(struct i2c_client *client,
 
         error = request_threaded_irq(as5011->button_irq,
                                      NULL, as5011_button_interrupt,
-                                     IRQF_TRIGGER_RISING |
-                                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                     IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                                      "as5011_button", as5011);
         if (error < 0) {
                 dev_err(&client->dev,
@@ -310,7 +294,7 @@ static int as5011_probe(struct i2c_client *client,
 
         error = request_threaded_irq(as5011->axis_irq, NULL,
                                      as5011_axis_interrupt,
-                                     plat_data->axis_irqflags | IRQF_ONESHOT,
+                                     plat_data->axis_irqflags,
                                      "as5011_joystick", as5011);
         if (error) {
                 dev_err(&client->dev,
@@ -341,7 +325,7 @@ err_free_mem:
         return error;
 }
 
-static int as5011_remove(struct i2c_client *client)
+static int __devexit as5011_remove(struct i2c_client *client)
 {
         struct as5011_device *as5011 = i2c_get_clientdata(client);
 
@@ -366,8 +350,18 @@ static struct i2c_driver as5011_driver = {
                 .name = "as5011",
         },
         .probe          = as5011_probe,
-        .remove         = as5011_remove,
+        .remove         = __devexit_p(as5011_remove),
         .id_table       = as5011_id,
 };
 
-module_i2c_driver(as5011_driver);
+static int __init as5011_init(void)
+{
+        return i2c_add_driver(&as5011_driver);
+}
+module_init(as5011_init);
+
+static void __exit as5011_exit(void)
+{
+        i2c_del_driver(&as5011_driver);
+}
+module_exit(as5011_exit);
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 65367e44d71..3497b87c3d0 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -261,4 +261,15 @@ static struct gameport_driver cobra_drv = {
         .disconnect     = cobra_disconnect,
 };
 
-module_gameport_driver(cobra_drv);
+static int __init cobra_init(void)
+{
+        return gameport_register_driver(&cobra_drv);
+}
+
+static void __exit cobra_exit(void)
+{
+        gameport_unregister_driver(&cobra_drv);
+}
+
+module_init(cobra_init);
+module_exit(cobra_exit);
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index ab1cf288200..0536b1b2f01 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -373,4 +373,15 @@ static struct gameport_driver gf2k_drv = {
         .disconnect     = gf2k_disconnect,
 };
 
-module_gameport_driver(gf2k_drv);
+static int __init gf2k_init(void)
+{
+        return gameport_register_driver(&gf2k_drv);
+}
+
+static void __exit gf2k_exit(void)
+{
+        gameport_unregister_driver(&gf2k_drv);
+}
+
+module_init(gf2k_init);
+module_exit(gf2k_exit);
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 9e1beff57c3..fc55899ba6c 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -424,4 +424,15 @@ static struct gameport_driver grip_drv = {
         .disconnect     = grip_disconnect,
 };
 
-module_gameport_driver(grip_drv);
+static int __init grip_init(void)
+{
+        return gameport_register_driver(&grip_drv);
+}
+
+static void __exit grip_exit(void)
+{
+        gameport_unregister_driver(&grip_drv);
+}
+
+module_init(grip_init);
+module_exit(grip_exit);
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index c0f9c7b7eb4..2d47baf4776 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -687,4 +687,15 @@ static struct gameport_driver grip_drv = {
         .disconnect     = grip_disconnect,
 };
 
-module_gameport_driver(grip_drv);
+static int __init grip_init(void)
+{
+        return gameport_register_driver(&grip_drv);
+}
+
+static void __exit grip_exit(void)
+{
+        gameport_unregister_driver(&grip_drv);
+}
+
+module_init(grip_init);
+module_exit(grip_exit);
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index 55196f730af..4058d4b272f 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -281,4 +281,15 @@ static struct gameport_driver guillemot_drv = {
         .disconnect     = guillemot_disconnect,
 };
 
-module_gameport_driver(guillemot_drv);
+static int __init guillemot_init(void)
+{
+        return gameport_register_driver(&guillemot_drv);
+}
+
+static void __exit guillemot_exit(void)
+{
+        gameport_unregister_driver(&guillemot_drv);
+}
+
+module_init(guillemot_init);
+module_exit(guillemot_exit);
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index daeeb4c7e3b..405febd94f2 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -317,8 +317,7 @@ int iforce_init_device(struct iforce *iforce)
                         break;
 
         if (i == 20) { /* 5 seconds */
-                dev_err(&input_dev->dev,
-                        "Timeout waiting for response from device.\n");
+                err("Timeout waiting for response from device.");
                 error = -ENODEV;
                 goto fail;
         }
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 08f98f2eaf8..a17b5001600 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -257,8 +257,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
 
                 status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC);
                 if (status) {
-                        dev_err(&iforce->intf->dev,
-                                "usb_submit_urb failed %d\n", status);
+                        err("usb_submit_urb failed %d", status);
                         return -1;
                 }
 
@@ -266,14 +265,12 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
                         iforce->ctrl->status != -EINPROGRESS, HZ);
 
                 if (iforce->ctrl->status) {
-                        dev_dbg(&iforce->intf->dev,
-                                "iforce->ctrl->status = %d\n",
-                                iforce->ctrl->status);
+                        dbg("iforce->ctrl->status = %d", iforce->ctrl->status);
                         usb_unlink_urb(iforce->ctrl);
                         return -1;
                 }
 #else
-                printk(KERN_DEBUG "iforce_get_id_packet: iforce->bus = USB!\n");
+                dbg("iforce_get_id_packet: iforce->bus = USB!");
 #endif
                 }
                 break;
@@ -292,15 +289,12 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
                         return -1;
                 }
 #else
-                dev_err(&iforce->dev->dev,
-                        "iforce_get_id_packet: iforce->bus = SERIO!\n");
+                err("iforce_get_id_packet: iforce->bus = SERIO!");
 #endif
                 break;
 
         default:
-                dev_err(&iforce->dev->dev,
-                        "iforce_get_id_packet: iforce->bus = %d\n",
-                        iforce->bus);
+                err("iforce_get_id_packet: iforce->bus = %d", iforce->bus);
                 break;
         }
 
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index d96aa27dfcd..6c96631ae5d 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -64,7 +64,7 @@ void iforce_usb_xmit(struct iforce *iforce)
 
         if ( (n=usb_submit_urb(iforce->out, GFP_ATOMIC)) ) {
                 clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);
-                dev_warn(&iforce->intf->dev, "usb_submit_urb failed %d\n", n);
+                dev_warn(&iforce->dev->dev, "usb_submit_urb failed %d\n", n);
         }
 
         /* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended.
@@ -76,7 +76,6 @@ void iforce_usb_xmit(struct iforce *iforce)
 static void iforce_usb_irq(struct urb *urb)
 {
         struct iforce *iforce = urb->context;
-        struct device *dev = &iforce->intf->dev;
         int status;
 
         switch (urb->status) {
@@ -87,12 +86,11 @@ static void iforce_usb_irq(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dev_dbg(dev, "%s - urb shutting down with status: %d\n",
-                        __func__, urb->status);
+                dbg("%s - urb shutting down with status: %d",
+                    __func__, urb->status);
                 return;
         default:
-                dev_dbg(dev, "%s - urb has status of: %d\n",
-                        __func__, urb->status);
+                dbg("%s - urb has status of: %d", __func__, urb->status);
                 goto exit;
         }
 
@@ -102,8 +100,8 @@ static void iforce_usb_irq(struct urb *urb)
 exit:
         status = usb_submit_urb (urb, GFP_ATOMIC);
         if (status)
-                dev_err(dev, "%s - usb_submit_urb failed with result %d\n",
-                        __func__, status);
+                err ("%s - usb_submit_urb failed with result %d",
+                     __func__, status);
 }
 
 static void iforce_usb_out(struct urb *urb)
@@ -112,8 +110,7 @@ static void iforce_usb_out(struct urb *urb)
 
         if (urb->status) {
                 clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);
-                dev_dbg(&iforce->intf->dev, "urb->status %d, exiting\n",
-                        urb->status);
+                dbg("urb->status %d, exiting", urb->status);
                 return;
         }
 
@@ -158,7 +155,6 @@ static int iforce_usb_probe(struct usb_interface *intf,
 
         iforce->bus = IFORCE_USB;
         iforce->usbdev = dev;
-        iforce->intf = intf;
 
         iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
         iforce->cr.wIndex = 0;
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index b1d7d9b0eb8..9f494b75848 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -115,7 +115,6 @@ struct iforce {
 #endif
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
         struct usb_device *usbdev;      /* USB transfer */
-        struct usb_interface *intf;
         struct urb *irq, *out, *ctrl;
         struct usb_ctrlrequest cr;
 #endif
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 88c22623a2e..16fb19d1ca2 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -311,4 +311,15 @@ static struct gameport_driver interact_drv = {
         .disconnect     = interact_disconnect,
 };
 
-module_gameport_driver(interact_drv);
+static int __init interact_init(void)
+{
+        return gameport_register_driver(&interact_drv);
+}
+
+static void __exit interact_exit(void)
+{
+        gameport_unregister_driver(&interact_drv);
+}
+
+module_init(interact_init);
+module_exit(interact_exit);
diff --git a/drivers/input/joystick/joydump.c b/drivers/input/joystick/joydump.c
index 7eb878bab96..cd894a0564a 100644
--- a/drivers/input/joystick/joydump.c
+++ b/drivers/input/joystick/joydump.c
@@ -159,4 +159,15 @@ static struct gameport_driver joydump_drv = {
         .disconnect     = joydump_disconnect,
 };
 
-module_gameport_driver(joydump_drv);
+static int __init joydump_init(void)
+{
+        return gameport_register_driver(&joydump_drv);
+}
+
+static void __exit joydump_exit(void)
+{
+        gameport_unregister_driver(&joydump_drv);
+}
+
+module_init(joydump_init);
+module_exit(joydump_exit);
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 9fb153eef2f..40e40780747 100644
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -222,4 +222,19 @@ static struct serio_driver magellan_drv = {
         .disconnect     = magellan_disconnect,
 };
 
-module_serio_driver(magellan_drv);
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init magellan_init(void)
+{
+        return serio_register_driver(&magellan_drv);
+}
+
+static void __exit magellan_exit(void)
+{
+        serio_unregister_driver(&magellan_drv);
+}
+
+module_init(magellan_init);
+module_exit(magellan_exit);
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index 59c10ec5a2a..77cfde571bd 100644
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -78,7 +78,7 @@ static void dc_pad_close(struct input_dev *dev)
 }
 
 /* allow the controller to be used */
-static int probe_maple_controller(struct device *dev)
+static int __devinit probe_maple_controller(struct device *dev)
 {
         static const short btn_bit[32] = {
                 BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1,
@@ -157,7 +157,7 @@ fail:
         return error;
 }
 
-static int remove_maple_controller(struct device *dev)
+static int __devexit remove_maple_controller(struct device *dev)
 {
         struct maple_device *mdev = to_maple_dev(dev);
         struct dc_pad *pad = maple_get_drvdata(mdev);
@@ -175,7 +175,7 @@ static struct maple_driver dc_pad_driver = {
         .drv = {
                 .name   = "Dreamcast_controller",
                 .probe  = probe_maple_controller,
-                .remove = remove_maple_controller,
+                .remove = __devexit_p(remove_maple_controller),
         },
 };
 
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 04c69af3714..b8d86115644 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -820,4 +820,15 @@ static struct gameport_driver sw_drv = {
         .disconnect     = sw_disconnect,
 };
 
-module_gameport_driver(sw_drv);
+static int __init sw_init(void)
+{
+        return gameport_register_driver(&sw_drv);
+}
+
+static void __exit sw_exit(void)
+{
+        gameport_unregister_driver(&sw_drv);
+}
+
+module_init(sw_init);
+module_exit(sw_exit);
diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index 80a7b27a457..0cd9b29356a 100644
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -296,4 +296,19 @@ static struct serio_driver spaceball_drv = {
         .disconnect     = spaceball_disconnect,
 };
 
-module_serio_driver(spaceball_drv);
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init spaceball_init(void)
+{
+        return serio_register_driver(&spaceball_drv);
+}
+
+static void __exit spaceball_exit(void)
+{
+        serio_unregister_driver(&spaceball_drv);
+}
+
+module_init(spaceball_init);
+module_exit(spaceball_exit);
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index a41f291652e..a694bf8e557 100644
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -237,4 +237,19 @@ static struct serio_driver spaceorb_drv = {
         .disconnect     = spaceorb_disconnect,
 };
 
-module_serio_driver(spaceorb_drv);
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init spaceorb_init(void)
+{
+        return serio_register_driver(&spaceorb_drv);
+}
+
+static void __exit spaceorb_exit(void)
+{
+        serio_unregister_driver(&spaceorb_drv);
+}
+
+module_init(spaceorb_init);
+module_exit(spaceorb_exit);
diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index 0f51a60e14a..e0db9f5e4b4 100644
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -208,4 +208,19 @@ static struct serio_driver stinger_drv = {
         .disconnect     = stinger_disconnect,
 };
 
-module_serio_driver(stinger_drv);
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init stinger_init(void)
+{
+        return serio_register_driver(&stinger_drv);
+}
+
+static void __exit stinger_exit(void)
+{
+        serio_unregister_driver(&stinger_drv);
+}
+
+module_init(stinger_init);
+module_exit(stinger_exit);
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 5ef9bcdb034..d6c60980711 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -436,4 +436,15 @@ static struct gameport_driver tmdc_drv = {
         .disconnect     = tmdc_disconnect,
 };
 
-module_gameport_driver(tmdc_drv);
+static int __init tmdc_init(void)
+{
+        return gameport_register_driver(&tmdc_drv);
+}
+
+static void __exit tmdc_exit(void)
+{
+        gameport_unregister_driver(&tmdc_drv);
+}
+
+module_init(tmdc_init);
+module_exit(tmdc_exit);
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index 2556a819357..3f4ec73c955 100644
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -257,4 +257,19 @@ static struct serio_driver twidjoy_drv = {
         .disconnect     = twidjoy_disconnect,
 };
 
-module_serio_driver(twidjoy_drv);
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init twidjoy_init(void)
+{
+        return serio_register_driver(&twidjoy_drv);
+}
+
+static void __exit twidjoy_exit(void)
+{
+        serio_unregister_driver(&twidjoy_drv);
+}
+
+module_init(twidjoy_init);
+module_exit(twidjoy_exit);
diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
index f8f892b076e..4dfa1eed4b7 100644
--- a/drivers/input/joystick/walkera0701.c
+++ b/drivers/input/joystick/walkera0701.c
@@ -196,7 +196,6 @@ static void walkera0701_close(struct input_dev *dev)
         struct walkera_dev *w = input_get_drvdata(dev);
 
         parport_disable_irq(w->parport);
-        hrtimer_cancel(&w->timer);
 }
 
 static int walkera0701_connect(struct walkera_dev *w, int parport)
@@ -225,9 +224,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
         if (parport_claim(w->pardevice))
                 goto init_err1;
 
-        hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-        w->timer.function = timer_handler;
-
         w->input_dev = input_allocate_device();
         if (!w->input_dev)
                 goto init_err2;
@@ -258,6 +254,8 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
         if (err)
                 goto init_err3;
 
+        hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+        w->timer.function = timer_handler;
         return 0;
 
  init_err3:
@@ -273,6 +271,7 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
 
 static void walkera0701_disconnect(struct walkera_dev *w)
 {
+        hrtimer_cancel(&w->timer);
         input_unregister_device(w->input_dev);
         parport_release(w->pardevice);
         parport_unregister_device(w->pardevice);
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 23b3071abb6..f72c83e15e6 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -217,4 +217,19 @@ static struct serio_driver warrior_drv = {
         .disconnect     = warrior_disconnect,
 };
 
-module_serio_driver(warrior_drv);
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init warrior_init(void)
+{
+        return serio_register_driver(&warrior_drv);
+}
+
+static void __exit warrior_exit(void)
+{
+        serio_unregister_driver(&warrior_drv);
+}
+
+module_init(warrior_init);
+module_exit(warrior_exit);
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index d6cbfe9df21..d72887585a1 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -98,15 +98,15 @@
 #define XTYPE_XBOX360W    2
 #define XTYPE_UNKNOWN     3
 
-static bool dpad_to_buttons;
+static int dpad_to_buttons;
 module_param(dpad_to_buttons, bool, S_IRUGO);
 MODULE_PARM_DESC(dpad_to_buttons, "Map D-PAD to buttons rather than axes for unknown pads");
 
-static bool triggers_to_buttons;
+static int triggers_to_buttons;
 module_param(triggers_to_buttons, bool, S_IRUGO);
 MODULE_PARM_DESC(triggers_to_buttons, "Map triggers to buttons rather than axes for unknown pads");
 
-static bool sticks_to_null;
+static int sticks_to_null;
 module_param(sticks_to_null, bool, S_IRUGO);
 MODULE_PARM_DESC(sticks_to_null, "Do not map sticks at all for unknown pads");
 
@@ -118,12 +118,11 @@ static const struct xpad_device {
         u8 xtype;
 } xpad_device[] = {
         { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", 0, XTYPE_XBOX },
+        { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", 0, XTYPE_XBOX },
         { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", 0, XTYPE_XBOX },
         { 0x045e, 0x0287, "Microsoft Xbox Controller S", 0, XTYPE_XBOX },
-        { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", 0, XTYPE_XBOX },
-        { 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
-        { 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
         { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
+        { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", DANCEPAD_MAP_CONFIG, XTYPE_XBOX },
         { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
         { 0x046d, 0xc242, "Logitech Chillstream Controller", 0, XTYPE_XBOX360 },
         { 0x046d, 0xca84, "Logitech Xbox Cordless Controller", 0, XTYPE_XBOX },
@@ -137,43 +136,34 @@ static const struct xpad_device {
         { 0x0738, 0x4540, "Mad Catz Beat Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
         { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", 0, XTYPE_XBOX },
         { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", XTYPE_XBOX360 },
         { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-        { 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 },
         { 0x0c12, 0x8802, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
-        { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", DANCEPAD_MAP_CONFIG, XTYPE_XBOX },
         { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", 0, XTYPE_XBOX },
         { 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
         { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
-        { 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
         { 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
         { 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
         { 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", 0, XTYPE_XBOX },
         { 0x0e6f, 0x0005, "Eclipse wireless Controller", 0, XTYPE_XBOX },
         { 0x0e6f, 0x0006, "Edge wireless Controller", 0, XTYPE_XBOX },
-        { 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
+        { 0x0e6f, 0x0006, "Pelican 'TSZ' Wired Xbox 360 Controller", 0, XTYPE_XBOX360 },
         { 0x0e6f, 0x0201, "Pelican PL-3601 'TSZ' Wired Xbox 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
         { 0x0e8f, 0x0201, "SmartJoy Frag Xpad/PS2 adaptor", 0, XTYPE_XBOX },
-        { 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
-        { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX },
         { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },
         { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },
-        { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+        { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
+        { 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", 0, XTYPE_XBOX360 },
         { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
         { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x1689, 0xfd00, "Razer Onza Tournament Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
+        { 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
         { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },
         { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
-        { 0x1bad, 0xf016, "Mad Catz Xbox 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x1bad, 0xf028, "Street Fighter IV FightPad", 0, XTYPE_XBOX360 },
-        { 0x1bad, 0xf901, "Gamestop Xbox 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x1bad, 0xf903, "Tron Xbox 360 controller", 0, XTYPE_XBOX360 },
-        { 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 },
+        { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
+        { 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
         { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
         { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
 };
@@ -243,29 +233,25 @@ static const signed short xpad_abs_triggers[] = {
         { XPAD_XBOX360_VENDOR_PROTOCOL(vend,1) }, \
         { XPAD_XBOX360_VENDOR_PROTOCOL(vend,129) }
 
-static struct usb_device_id xpad_table[] = {
+static struct usb_device_id xpad_table [] = {
         { USB_INTERFACE_INFO('X', 'B', 0) },    /* X-Box USB-IF not approved class */
         XPAD_XBOX360_VENDOR(0x045e),            /* Microsoft X-Box 360 controllers */
         XPAD_XBOX360_VENDOR(0x046d),            /* Logitech X-Box 360 style controllers */
         XPAD_XBOX360_VENDOR(0x0738),            /* Mad Catz X-Box 360 controllers */
-        { USB_DEVICE(0x0738, 0x4540) },         /* Mad Catz Beat Pad */
         XPAD_XBOX360_VENDOR(0x0e6f),            /* 0x0e6f X-Box 360 controllers */
         XPAD_XBOX360_VENDOR(0x12ab),            /* X-Box 360 dance pads */
         XPAD_XBOX360_VENDOR(0x1430),            /* RedOctane X-Box 360 controllers */
         XPAD_XBOX360_VENDOR(0x146b),            /* BigBen Interactive Controllers */
         XPAD_XBOX360_VENDOR(0x1bad),            /* Harminix Rock Band Guitar and Drums */
-        XPAD_XBOX360_VENDOR(0x0f0d),            /* Hori Controllers */
-        XPAD_XBOX360_VENDOR(0x1689),            /* Razer Onza */
-        XPAD_XBOX360_VENDOR(0x24c6),            /* PowerA Controllers */
+        XPAD_XBOX360_VENDOR(0x0f0d),            /* Hori Controllers */
         { }
 };
 
-MODULE_DEVICE_TABLE(usb, xpad_table);
+MODULE_DEVICE_TABLE (usb, xpad_table);
 
 struct usb_xpad {
         struct input_dev *dev;          /* input device interface */
         struct usb_device *udev;        /* usb device */
-        struct usb_interface *intf;     /* usb interface */
 
         int pad_present;
 
@@ -471,7 +457,6 @@ static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned cha
 static void xpad_irq_in(struct urb *urb)
 {
         struct usb_xpad *xpad = urb->context;
-        struct device *dev = &xpad->intf->dev;
         int retval, status;
 
         status = urb->status;
@@ -484,11 +469,11 @@ static void xpad_irq_in(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dev_dbg(dev, "%s - urb shutting down with status: %d\n",
+                dbg("%s - urb shutting down with status: %d",
                         __func__, status);
                 return;
         default:
-                dev_dbg(dev, "%s - nonzero urb status received: %d\n",
+                dbg("%s - nonzero urb status received: %d",
                         __func__, status);
                 goto exit;
         }
@@ -507,15 +492,12 @@ static void xpad_irq_in(struct urb *urb)
 exit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
-                dev_err(dev, "%s - usb_submit_urb failed with result %d\n",
-                        __func__, retval);
+                err ("%s - usb_submit_urb failed with result %d",
+                     __func__, retval);
 }
 
 static void xpad_bulk_out(struct urb *urb)
 {
-        struct usb_xpad *xpad = urb->context;
-        struct device *dev = &xpad->intf->dev;
-
         switch (urb->status) {
         case 0:
                 /* success */
@@ -524,20 +506,16 @@ static void xpad_bulk_out(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dev_dbg(dev, "%s - urb shutting down with status: %d\n",
-                        __func__, urb->status);
+                dbg("%s - urb shutting down with status: %d", __func__, urb->status);
                 break;
         default:
-                dev_dbg(dev, "%s - nonzero urb status received: %d\n",
-                        __func__, urb->status);
+                dbg("%s - nonzero urb status received: %d", __func__, urb->status);
         }
 }
 
 #if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS)
 static void xpad_irq_out(struct urb *urb)
 {
-        struct usb_xpad *xpad = urb->context;
-        struct device *dev = &xpad->intf->dev;
         int retval, status;
 
         status = urb->status;
@@ -551,21 +529,19 @@ static void xpad_irq_out(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dev_dbg(dev, "%s - urb shutting down with status: %d\n",
-                        __func__, status);
+                dbg("%s - urb shutting down with status: %d", __func__, status);
                 return;
 
         default:
-                dev_dbg(dev, "%s - nonzero urb status received: %d\n",
-                        __func__, status);
+                dbg("%s - nonzero urb status received: %d", __func__, status);
                 goto exit;
         }
 
 exit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
-                dev_err(dev, "%s - usb_submit_urb failed with result %d\n",
-                        __func__, retval);
+                err("%s - usb_submit_urb failed with result %d",
+                    __func__, retval);
 }
 
 static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
@@ -678,8 +654,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect
                         return usb_submit_urb(xpad->irq_out, GFP_ATOMIC);
 
                 default:
-                        dev_dbg(&xpad->dev->dev,
-                                "%s - rumble command sent to unsupported xpad type: %d\n",
+                        dbg("%s - rumble command sent to unsupported xpad type: %d",
                                 __func__, xpad->xtype);
                         return -1;
                 }
@@ -792,7 +767,7 @@ static int xpad_open(struct input_dev *dev)
         struct usb_xpad *xpad = input_get_drvdata(dev);
 
         /* URB was submitted in probe */
-        if (xpad->xtype == XTYPE_XBOX360W)
+        if(xpad->xtype == XTYPE_XBOX360W)
                 return 0;
 
         xpad->irq_in->dev = xpad->udev;
@@ -869,7 +844,6 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         }
 
         xpad->udev = udev;
-        xpad->intf = intf;
         xpad->mapping = xpad_device[i].mapping;
         xpad->xtype = xpad_device[i].xtype;
 
@@ -1067,7 +1041,18 @@ static struct usb_driver xpad_driver = {
         .id_table       = xpad_table,
 };
 
-module_usb_driver(xpad_driver);
+static int __init usb_xpad_init(void)
+{
+        return usb_register(&xpad_driver);
+}
+
+static void __exit usb_xpad_exit(void)
+{
+        usb_deregister(&xpad_driver);
+}
+
+module_init(usb_xpad_init);
+module_exit(usb_xpad_exit);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/input/joystick/zhenhua.c b/drivers/input/joystick/zhenhua.c
index c4de4388fd7..b5853125c89 100644
--- a/drivers/input/joystick/zhenhua.c
+++ b/drivers/input/joystick/zhenhua.c
@@ -225,4 +225,19 @@ static struct serio_driver zhenhua_drv = {
         .disconnect     = zhenhua_disconnect,
 };
 
-module_serio_driver(zhenhua_drv);
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init zhenhua_init(void)
+{
+        return serio_register_driver(&zhenhua_drv);
+}
+
+static void __exit zhenhua_exit(void)
+{
+        serio_unregister_driver(&zhenhua_drv);
+}
+
+module_init(zhenhua_init);
+module_exit(zhenhua_exit);