/spare/repo/libata-dev branch 'iomap-try3'

[cascardo/linux.git] / drivers / char / misc.c

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 0937544..931efd5 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -66,8 +66,6 @@ static unsigned char misc_minors[DYNAMIC_MINORS / 8];
 extern int rtc_DP8570A_init(void);
 extern int rtc_MK48T08_init(void);
 extern int pmu_device_init(void);
-extern int tosh_init(void);
-extern int i8k_init(void);
 
 #ifdef CONFIG_PROC_FS
 static void *misc_seq_start(struct seq_file *seq, loff_t *pos)
@@ -177,10 +175,10 @@ fail:
 
 /* 
  * TODO for 2.7:
- *  - add a struct class_device to struct miscdevice and make all usages of
+ *  - add a struct kref to struct miscdevice and make all usages of
  *    them dynamic.
  */
-static struct class_simple *misc_class;
+static struct class *misc_class;
 
 static struct file_operations misc_fops = {
        .owner          = THIS_MODULE,
@@ -238,8 +236,8 @@ int misc_register(struct miscdevice * misc)
        }
        dev = MKDEV(MISC_MAJOR, misc->minor);
 
-       misc->class = class_simple_device_add(misc_class, dev,
-                                             misc->dev, misc->name);
+       misc->class = class_device_create(misc_class, dev, misc->dev,
+                                         "%s", misc->name);
        if (IS_ERR(misc->class)) {
                err = PTR_ERR(misc->class);
                goto out;
@@ -248,7 +246,7 @@ int misc_register(struct miscdevice * misc)
        err = devfs_mk_cdev(dev, S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP, 
                            misc->devfs_name);
        if (err) {
-               class_simple_device_remove(dev);
+               class_device_destroy(misc_class, dev);
                goto out;
        }
 
@@ -281,7 +279,7 @@ int misc_deregister(struct miscdevice * misc)
 
        down(&misc_sem);
        list_del(&misc->list);
-       class_simple_device_remove(MKDEV(MISC_MAJOR, misc->minor));
+       class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
        devfs_remove(misc->devfs_name);
        if (i < DYNAMIC_MINORS && i>0) {
                misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
@@ -302,7 +300,7 @@ static int __init misc_init(void)
        if (ent)
                ent->proc_fops = &misc_proc_fops;
 #endif
-       misc_class = class_simple_create(THIS_MODULE, "misc");
+       misc_class = class_create(THIS_MODULE, "misc");
        if (IS_ERR(misc_class))
                return PTR_ERR(misc_class);
 #ifdef CONFIG_MVME16x
@@ -310,20 +308,11 @@ static int __init misc_init(void)
 #endif
 #ifdef CONFIG_BVME6000
        rtc_DP8570A_init();
-#endif
-#ifdef CONFIG_PMAC_PBOOK
-       pmu_device_init();
-#endif
-#ifdef CONFIG_TOSHIBA
-       tosh_init();
-#endif
-#ifdef CONFIG_I8K
-       i8k_init();
 #endif
        if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
                printk("unable to get major %d for misc devices\n",
                       MISC_MAJOR);
-               class_simple_destroy(misc_class);
+               class_destroy(misc_class);
                return -EIO;
        }
        return 0;