Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / block / paride / pt.c

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index d2013d362403819c49c2e21ffe54f64f311796cd..9f4e67ee1eb0628917155e99c31810bcbb4a6404 100644 (file)
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -141,7 +141,6 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtio.h>
@@ -233,7 +232,7 @@ static char pt_scratch[512];        /* scratch block buffer */
 
 /* kernel glue structures */
 
-static struct file_operations pt_fops = {
+static const struct file_operations pt_fops = {
        .owner = THIS_MODULE,
        .read = pt_read,
        .write = pt_write,
@@ -947,12 +946,12 @@ static int __init pt_init(void)
        int err;
 
        if (disable) {
-               err = -1;
+               err = -EINVAL;
                goto out;
        }
 
        if (pt_detect()) {
-               err = -1;
+               err = -ENODEV;
                goto out;
        }
 
@@ -971,32 +970,15 @@ static int __init pt_init(void)
                goto out_chrdev;
        }
 
-       devfs_mk_dir("pt");
        for (unit = 0; unit < PT_UNITS; unit++)
                if (pt[unit].present) {
                        class_device_create(pt_class, NULL, MKDEV(major, unit),
                                        NULL, "pt%d", unit);
-                       err = devfs_mk_cdev(MKDEV(major, unit),
-                                     S_IFCHR | S_IRUSR | S_IWUSR,
-                                     "pt/%d", unit);
-                       if (err) {
-                               class_device_destroy(pt_class, MKDEV(major, unit));
-                               goto out_class;
-                       }
                        class_device_create(pt_class, NULL, MKDEV(major, unit + 128),
                                        NULL, "pt%dn", unit);
-                       err = devfs_mk_cdev(MKDEV(major, unit + 128),
-                                     S_IFCHR | S_IRUSR | S_IWUSR,
-                                     "pt/%dn", unit);
-                       if (err) {
-                               class_device_destroy(pt_class, MKDEV(major, unit + 128));
-                               goto out_class;
-                       }
                }
        goto out;
 
-out_class:
-       class_destroy(pt_class);
 out_chrdev:
        unregister_chrdev(major, "pt");
 out:
@@ -1009,12 +991,9 @@ static void __exit pt_exit(void)
        for (unit = 0; unit < PT_UNITS; unit++)
                if (pt[unit].present) {
                        class_device_destroy(pt_class, MKDEV(major, unit));
-                       devfs_remove("pt/%d", unit);
                        class_device_destroy(pt_class, MKDEV(major, unit + 128));
-                       devfs_remove("pt/%dn", unit);
                }
        class_destroy(pt_class);
-       devfs_remove("pt");
        unregister_chrdev(major, name);
        for (unit = 0; unit < PT_UNITS; unit++)
                if (pt[unit].present)