Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

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

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 13f998a..ab86e23 100644 (file)
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -227,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,
@@ -646,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;
        }
 
@@ -676,8 +676,8 @@ static int __init pg_init(void)
        for (unit = 0; unit < PG_UNITS; unit++) {
                struct pg *dev = &devices[unit];
                if (dev->present)
-                       class_device_create(pg_class, NULL, MKDEV(major, unit),
-                                       NULL, "pg%u", unit);
+                       device_create(pg_class, NULL, MKDEV(major, unit),
+                                     "pg%u", unit);
        }
        err = 0;
        goto out;
@@ -695,7 +695,7 @@ static void __exit pg_exit(void)
        for (unit = 0; unit < PG_UNITS; unit++) {
                struct pg *dev = &devices[unit];
                if (dev->present)
-                       class_device_destroy(pg_class, MKDEV(major, unit));
+                       device_destroy(pg_class, MKDEV(major, unit));
        }
        class_destroy(pg_class);
        unregister_chrdev(major, name);