[PKT_SCHED] HTB: htb_classid is dead static inline

[linux-2.6-omap-h63xx.git] / drivers / char / dsp56k.c

diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index db984e481d4ca42908fffee5fb426528d119e82b..a69c6528326005694809005a546436a1af5cd5d1 100644 (file)
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -32,7 +32,6 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 
 #include <asm/atarihw.h>
@@ -137,7 +136,7 @@ static int sizeof_bootstrap = 375;
 
 
 static struct dsp56k_device {
-       long in_use;
+       unsigned long in_use;
        long maxio, timeout;
        int tx_wsize, rx_wsize;
 } dsp56k;
@@ -514,7 +513,7 @@ static int __init dsp56k_init_driver(void)
                err = PTR_ERR(dsp56k_class);
                goto out_chrdev;
        }
-       class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
+       device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), "dsp56k");
 
        printk(banner);
        goto out;
@@ -528,7 +527,7 @@ module_init(dsp56k_init_driver);
 
 static void __exit dsp56k_cleanup_driver(void)
 {
-       class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
+       device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
        class_destroy(dsp56k_class);
        unregister_chrdev(DSP56K_MAJOR, "dsp56k");
 }