vserver 1.9.3

[linux-2.6.git] / drivers / input / joystick / spaceorb.c

diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index 00da66c..c20091a 100644 (file)
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -38,8 +38,10 @@
 #include <linux/input.h>
 #include <linux/serio.h>
 
+#define DRIVER_DESC    "SpaceTec SpaceOrb 360 and Avenger 6dof controller driver"
+
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
-MODULE_DESCRIPTION("SpaceTec SpaceOrb 360 and Avenger 6dof controller driver");
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
 /*
@@ -162,7 +164,7 @@ static void spaceorb_disconnect(struct serio *serio)
  * it as an input device.
  */
 
-static void spaceorb_connect(struct serio *serio, struct serio_dev *dev)
+static void spaceorb_connect(struct serio *serio, struct serio_driver *drv)
 {
        struct spaceorb *spaceorb;
        int i, t;
@@ -201,7 +203,7 @@ static void spaceorb_connect(struct serio *serio, struct serio_dev *dev)
 
        serio->private = spaceorb;
 
-       if (serio_open(serio, dev)) {
+       if (serio_open(serio, drv)) {
                kfree(spaceorb);
                return;
        }
@@ -213,10 +215,14 @@ static void spaceorb_connect(struct serio *serio, struct serio_dev *dev)
  * The serio device structure.
  */
 
-static struct serio_dev spaceorb_dev = {
-       .interrupt =    spaceorb_interrupt,
-       .connect =      spaceorb_connect,
-       .disconnect =   spaceorb_disconnect,
+static struct serio_driver spaceorb_drv = {
+       .driver         = {
+               .name   = "spaceorb",
+       },
+       .description    = DRIVER_DESC,
+       .interrupt      = spaceorb_interrupt,
+       .connect        = spaceorb_connect,
+       .disconnect     = spaceorb_disconnect,
 };
 
 /*
@@ -225,13 +231,13 @@ static struct serio_dev spaceorb_dev = {
 
 int __init spaceorb_init(void)
 {
-       serio_register_device(&spaceorb_dev);
+       serio_register_driver(&spaceorb_drv);
        return 0;
 }
 
 void __exit spaceorb_exit(void)
 {
-       serio_unregister_device(&spaceorb_dev);
+       serio_unregister_driver(&spaceorb_drv);
 }
 
 module_init(spaceorb_init);