vserver 1.9.3

[linux-2.6.git] / drivers / input / mouse / vsxxxaa.c

diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index c26d907..3845ca4 100644 (file)
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -82,8 +82,10 @@
 #include <linux/serio.h>
 #include <linux/init.h>
 
+#define DRIVER_DESC    "Serial DEC VSXXX-AA/GA mouse / DEC tablet driver"
+
 MODULE_AUTHOR ("Jan-Benedict Glaw <jbglaw@lug-owl.de>");
-MODULE_DESCRIPTION ("Serial DEC VSXXX-AA/GA mouse / DEC tablet driver");
+MODULE_DESCRIPTION (DRIVER_DESC);
 MODULE_LICENSE ("GPL");
 
 #undef VSXXXAA_DEBUG
@@ -482,7 +484,7 @@ vsxxxaa_disconnect (struct serio *serio)
 }
 
 static void
-vsxxxaa_connect (struct serio *serio, struct serio_dev *dev)
+vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
 {
        struct vsxxxaa *mouse;
 
@@ -524,7 +526,7 @@ vsxxxaa_connect (struct serio *serio, struct serio_dev *dev)
        mouse->dev.id.bustype = BUS_RS232;
        mouse->serio = serio;
 
-       if (serio_open (serio, dev)) {
+       if (serio_open (serio, drv)) {
                kfree (mouse);
                return;
        }
@@ -540,23 +542,27 @@ vsxxxaa_connect (struct serio *serio, struct serio_dev *dev)
        printk (KERN_INFO "input: %s on %s\n", mouse->name, mouse->phys);
 }
 
-static struct serio_dev vsxxxaa_dev = {
-       .connect = vsxxxaa_connect,
-       .interrupt = vsxxxaa_interrupt,
-       .disconnect = vsxxxaa_disconnect,
+static struct serio_driver vsxxxaa_drv = {
+       .driver         = {
+               .name   = "vsxxxaa",
+       },
+       .description    = DRIVER_DESC,
+       .connect        = vsxxxaa_connect,
+       .interrupt      = vsxxxaa_interrupt,
+       .disconnect     = vsxxxaa_disconnect,
 };
 
 int __init
 vsxxxaa_init (void)
 {
-       serio_register_device (&vsxxxaa_dev);
+       serio_register_driver(&vsxxxaa_drv);
        return 0;
 }
 
 void __exit
 vsxxxaa_exit (void)
 {
-       serio_unregister_device (&vsxxxaa_dev);
+       serio_unregister_driver(&vsxxxaa_drv);
 }
 
 module_init (vsxxxaa_init);