ata_piix: Add HP Compaq nc6000 to the broken poweroff list

[safe/jmp/linux-2.6] / drivers / char / misc.c

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index bf2e49e..a5e0db9 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -34,7 +34,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/config.h>
 
 #include <linux/fs.h>
 #include <linux/errno.h>
@@ -42,20 +41,21 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/tty.h>
 #include <linux/kmod.h>
+#include <linux/smp_lock.h>
 
 /*
  * Head entry for the doubly linked miscdevice list
  */
 static LIST_HEAD(misc_list);
-static DECLARE_MUTEX(misc_sem);
+static DEFINE_MUTEX(misc_mtx);
 
 /*
  * Assigned numbers, used for dynamic minors
@@ -68,35 +68,23 @@ extern int pmu_device_init(void);
 #ifdef CONFIG_PROC_FS
 static void *misc_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       struct miscdevice *p;
-       loff_t off = 0;
-
-       down(&misc_sem);
-       list_for_each_entry(p, &misc_list, list) {
-               if (*pos == off++) 
-                       return p;
-       }
-       return NULL;
+       mutex_lock(&misc_mtx);
+       return seq_list_start(&misc_list, *pos);
 }
 
 static void *misc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       struct list_head *n = ((struct miscdevice *)v)->list.next;
-
-       ++*pos;
-
-       return (n != &misc_list) ? list_entry(n, struct miscdevice, list)
-                : NULL;
+       return seq_list_next(v, &misc_list, pos);
 }
 
 static void misc_seq_stop(struct seq_file *seq, void *v)
 {
-       up(&misc_sem);
+       mutex_unlock(&misc_mtx);
 }
 
 static int misc_seq_show(struct seq_file *seq, void *v)
 {
-       const struct miscdevice *p = v;
+       const struct miscdevice *p = list_entry(v, struct miscdevice, list);
 
        seq_printf(seq, "%3i %s\n", p->minor, p->name ? p->name : "");
        return 0;
@@ -115,7 +103,7 @@ static int misc_seq_open(struct inode *inode, struct file *file)
        return seq_open(file, &misc_seq_ops);
 }
 
-static struct file_operations misc_proc_fops = {
+static const struct file_operations misc_proc_fops = {
        .owner   = THIS_MODULE,
        .open    = misc_seq_open,
        .read    = seq_read,
@@ -131,7 +119,8 @@ static int misc_open(struct inode * inode, struct file * file)
        int err = -ENODEV;
        const struct file_operations *old_fops, *new_fops = NULL;
        
-       down(&misc_sem);
+       lock_kernel();
+       mutex_lock(&misc_mtx);
        
        list_for_each_entry(c, &misc_list, list) {
                if (c->minor == minor) {
@@ -141,9 +130,9 @@ static int misc_open(struct inode * inode, struct file * file)
        }
                
        if (!new_fops) {
-               up(&misc_sem);
+               mutex_unlock(&misc_mtx);
                request_module("char-major-%d-%d", MISC_MAJOR, minor);
-               down(&misc_sem);
+               mutex_lock(&misc_mtx);
 
                list_for_each_entry(c, &misc_list, list) {
                        if (c->minor == minor) {
@@ -167,18 +156,14 @@ static int misc_open(struct inode * inode, struct file * file)
        }
        fops_put(old_fops);
 fail:
-       up(&misc_sem);
+       mutex_unlock(&misc_mtx);
+       unlock_kernel();
        return err;
 }
 
-/* 
- * TODO for 2.7:
- *  - add a struct kref to struct miscdevice and make all usages of
- *    them dynamic.
- */
 static struct class *misc_class;
 
-static struct file_operations misc_fops = {
+static const struct file_operations misc_fops = {
        .owner          = THIS_MODULE,
        .open           = misc_open,
 };
@@ -206,10 +191,12 @@ int misc_register(struct miscdevice * misc)
        dev_t dev;
        int err = 0;
 
-       down(&misc_sem);
+       INIT_LIST_HEAD(&misc->list);
+
+       mutex_lock(&misc_mtx);
        list_for_each_entry(c, &misc_list, list) {
                if (c->minor == misc->minor) {
-                       up(&misc_sem);
+                       mutex_unlock(&misc_mtx);
                        return -EBUSY;
                }
        }
@@ -220,7 +207,7 @@ int misc_register(struct miscdevice * misc)
                        if ( (misc_minors[i>>3] & (1 << (i&7))) == 0)
                                break;
                if (i<0) {
-                       up(&misc_sem);
+                       mutex_unlock(&misc_mtx);
                        return -EBUSY;
                }
                misc->minor = i;
@@ -228,16 +215,12 @@ int misc_register(struct miscdevice * misc)
 
        if (misc->minor < DYNAMIC_MINORS)
                misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
-       if (misc->devfs_name[0] == '\0') {
-               snprintf(misc->devfs_name, sizeof(misc->devfs_name),
-                               "misc/%s", misc->name);
-       }
        dev = MKDEV(MISC_MAJOR, misc->minor);
 
-       misc->class = class_device_create(misc_class, NULL, dev, misc->dev,
+       misc->this_device = device_create(misc_class, misc->parent, dev, NULL,
                                          "%s", misc->name);
-       if (IS_ERR(misc->class)) {
-               err = PTR_ERR(misc->class);
+       if (IS_ERR(misc->this_device)) {
+               err = PTR_ERR(misc->this_device);
                goto out;
        }
 
@@ -247,7 +230,7 @@ int misc_register(struct miscdevice * misc)
         */
        list_add(&misc->list, &misc_list);
  out:
-       up(&misc_sem);
+       mutex_unlock(&misc_mtx);
        return err;
 }
 
@@ -261,20 +244,20 @@ int misc_register(struct miscdevice * misc)
  *     indicates an error.
  */
 
-int misc_deregister(struct miscdevice * misc)
+int misc_deregister(struct miscdevice *misc)
 {
        int i = misc->minor;
 
        if (list_empty(&misc->list))
                return -EINVAL;
 
-       down(&misc_sem);
+       mutex_lock(&misc_mtx);
        list_del(&misc->list);
-       class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
+       device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
        if (i < DYNAMIC_MINORS && i>0) {
                misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
        }
-       up(&misc_sem);
+       mutex_unlock(&misc_mtx);
        return 0;
 }
 
@@ -283,23 +266,26 @@ EXPORT_SYMBOL(misc_deregister);
 
 static int __init misc_init(void)
 {
-#ifdef CONFIG_PROC_FS
-       struct proc_dir_entry *ent;
+       int err;
 
-       ent = create_proc_entry("misc", 0, NULL);
-       if (ent)
-               ent->proc_fops = &misc_proc_fops;
+#ifdef CONFIG_PROC_FS
+       proc_create("misc", 0, NULL, &misc_proc_fops);
 #endif
        misc_class = class_create(THIS_MODULE, "misc");
+       err = PTR_ERR(misc_class);
        if (IS_ERR(misc_class))
-               return PTR_ERR(misc_class);
+               goto fail_remove;
 
-       if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
-               printk("unable to get major %d for misc devices\n",
-                      MISC_MAJOR);
-               class_destroy(misc_class);
-               return -EIO;
-       }
+       err = -EIO;
+       if (register_chrdev(MISC_MAJOR,"misc",&misc_fops))
+               goto fail_printk;
        return 0;
+
+fail_printk:
+       printk("unable to get major %d for misc devices\n", MISC_MAJOR);
+       class_destroy(misc_class);
+fail_remove:
+       remove_proc_entry("misc", NULL);
+       return err;
 }
 subsys_initcall(misc_init);