vserver 1.9.3

[linux-2.6.git] / drivers / input / keyboard / newtonkbd.c

diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c
index dc47acb..caa92dd 100644 (file)
--- a/drivers/input/keyboard/newtonkbd.c
+++ b/drivers/input/keyboard/newtonkbd.c
@@ -32,8 +32,10 @@
 #include <linux/init.h>
 #include <linux/serio.h>
 
+#define DRIVER_DESC    "Newton keyboard driver"
+
 MODULE_AUTHOR("Justin Cormack <j.cormack@doc.ic.ac.uk>");
-MODULE_DESCRIPTION("Newton keyboard driver");
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
 #define NKBD_KEY       0x7f
@@ -82,7 +84,7 @@ irqreturn_t nkbd_interrupt(struct serio *serio,
 
 }
 
-void nkbd_connect(struct serio *serio, struct serio_dev *dev)
+void nkbd_connect(struct serio *serio, struct serio_driver *drv)
 {
        struct nkbd *nkbd;
        int i;
@@ -106,7 +108,7 @@ void nkbd_connect(struct serio *serio, struct serio_dev *dev)
        nkbd->dev.private = nkbd;
        serio->private = nkbd;
 
-       if (serio_open(serio, dev)) {
+       if (serio_open(serio, drv)) {
                kfree(nkbd);
                return;
        }
@@ -138,21 +140,25 @@ void nkbd_disconnect(struct serio *serio)
        kfree(nkbd);
 }
 
-struct serio_dev nkbd_dev = {
-       .interrupt =    nkbd_interrupt,
-       .connect =      nkbd_connect,
-       .disconnect =   nkbd_disconnect
+struct serio_driver nkbd_drv = {
+       .driver         = {
+               .name   = "newtonkbd",
+       },
+       .description    = DRIVER_DESC,
+       .interrupt      = nkbd_interrupt,
+       .connect        = nkbd_connect,
+       .disconnect     = nkbd_disconnect,
 };
 
 int __init nkbd_init(void)
 {
-       serio_register_device(&nkbd_dev);
+       serio_register_driver(&nkbd_drv);
        return 0;
 }
 
 void __exit nkbd_exit(void)
 {
-       serio_unregister_device(&nkbd_dev);
+       serio_unregister_driver(&nkbd_drv);
 }
 
 module_init(nkbd_init);