Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / drivers / block / paride / pg.c

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 79b8682..d89e7d3 100644 (file)
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -156,7 +156,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 #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>
@@ -228,7 +227,7 @@ static struct class *pg_class;
 
 /* kernel glue structures */
 
-static struct file_operations pg_fops = {
+static const struct file_operations pg_fops = {
        .owner = THIS_MODULE,
        .read = pg_read,
        .write = pg_write,
@@ -647,14 +646,14 @@ static int __init pg_init(void)
        int err;
 
        if (disable){
-               err = -1;
+               err = -EINVAL;
                goto out;
        }
 
        pg_init_units();
 
        if (pg_detect()) {
-               err = -1;
+               err = -ENODEV;
                goto out;
        }
 
@@ -674,25 +673,15 @@ static int __init pg_init(void)
                err = PTR_ERR(pg_class);
                goto out_chrdev;
        }
-       devfs_mk_dir("pg");
        for (unit = 0; unit < PG_UNITS; unit++) {
                struct pg *dev = &devices[unit];
-               if (dev->present) {
+               if (dev->present)
                        class_device_create(pg_class, NULL, MKDEV(major, unit),
                                        NULL, "pg%u", unit);
-                       err = devfs_mk_cdev(MKDEV(major, unit),
-                                     S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u",
-                                     unit);
-                       if (err) 
-                               goto out_class;
-               }
        }
        err = 0;
        goto out;
 
-out_class:
-       class_device_destroy(pg_class, MKDEV(major, unit));
-       class_destroy(pg_class);
 out_chrdev:
        unregister_chrdev(major, "pg");
 out:
@@ -705,13 +694,10 @@ static void __exit pg_exit(void)
 
        for (unit = 0; unit < PG_UNITS; unit++) {
                struct pg *dev = &devices[unit];
-               if (dev->present) {
+               if (dev->present)
                        class_device_destroy(pg_class, MKDEV(major, unit));
-                       devfs_remove("pg/%u", unit);
-               }
        }
        class_destroy(pg_class);
-       devfs_remove("pg");
        unregister_chrdev(major, name);
 
        for (unit = 0; unit < PG_UNITS; unit++) {