fix mismerge in ll_rw_blk.c

[pandora-kernel.git] / drivers / char / raw.c

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index ca5f42b..f13e5de 100644 (file)
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -27,7 +27,7 @@ struct raw_device_data {
        int inuse;
 };
 
-static struct class_simple *raw_class;
+static struct class *raw_class;
 static struct raw_device_data raw_devices[MAX_RAW_MINORS];
 static DECLARE_MUTEX(raw_mutex);
 static struct file_operations raw_ctl_fops;         /* forward declaration */
@@ -127,8 +127,8 @@ raw_ioctl(struct inode *inode, struct file *filp,
 
 static void bind_device(struct raw_config_request *rq)
 {
-       class_simple_device_remove(MKDEV(RAW_MAJOR, rq->raw_minor));
-       class_simple_device_add(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor),
+       class_device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));
+       class_device_create(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor),
                                      NULL, "raw%d", rq->raw_minor);
 }
 
@@ -200,8 +200,8 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
                        if (rq.block_major == 0 && rq.block_minor == 0) {
                                /* unbind */
                                rawdev->binding = NULL;
-                               class_simple_device_remove(MKDEV(RAW_MAJOR,
-                                                               rq.raw_minor));
+                               class_device_destroy(raw_class,
+                                               MKDEV(RAW_MAJOR, rq.raw_minor));
                        } else {
                                rawdev->binding = bdget(dev);
                                if (rawdev->binding == NULL)
@@ -300,14 +300,14 @@ static int __init raw_init(void)
                goto error;
        }
 
-       raw_class = class_simple_create(THIS_MODULE, "raw");
+       raw_class = class_create(THIS_MODULE, "raw");
        if (IS_ERR(raw_class)) {
                printk(KERN_ERR "Error creating raw class.\n");
                cdev_del(&raw_cdev);
                unregister_chrdev_region(dev, MAX_RAW_MINORS);
                goto error;
        }
-       class_simple_device_add(raw_class, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
+       class_device_create(raw_class, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
        devfs_mk_cdev(MKDEV(RAW_MAJOR, 0),
                      S_IFCHR | S_IRUGO | S_IWUGO,
@@ -331,8 +331,8 @@ static void __exit raw_exit(void)
                devfs_remove("raw/raw%d", i);
        devfs_remove("raw/rawctl");
        devfs_remove("raw");
-       class_simple_device_remove(MKDEV(RAW_MAJOR, 0));
-       class_simple_destroy(raw_class);
+       class_device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));
+       class_destroy(raw_class);
        cdev_del(&raw_cdev);
        unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), MAX_RAW_MINORS);
 }