Merge branch 'devel' into next

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

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 9970aed..9d92636 100644 (file)
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -162,6 +162,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 #include <linux/pg.h>
 #include <linux/device.h>
 #include <linux/sched.h>       /* current, TASK_* */
+#include <linux/smp_lock.h>
 #include <linux/jiffies.h>
 
 #include <asm/uaccess.h>
@@ -227,7 +228,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,
@@ -515,12 +516,18 @@ static int pg_open(struct inode *inode, struct file *file)
 {
        int unit = iminor(inode) & 0x7f;
        struct pg *dev = &devices[unit];
+       int ret = 0;
 
-       if ((unit >= PG_UNITS) || (!dev->present))
-               return -ENODEV;
+       lock_kernel();
+       if ((unit >= PG_UNITS) || (!dev->present)) {
+               ret = -ENODEV;
+               goto out;
+       }
 
-       if (test_and_set_bit(0, &dev->access))
-               return -EBUSY;
+       if (test_and_set_bit(0, &dev->access)) {
+               ret = -EBUSY;
+               goto out;
+       }
 
        if (dev->busy) {
                pg_reset(dev);
@@ -533,12 +540,15 @@ static int pg_open(struct inode *inode, struct file *file)
        if (dev->bufptr == NULL) {
                clear_bit(0, &dev->access);
                printk("%s: buffer allocation failed\n", dev->name);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto out;
        }
 
        file->private_data = dev;
 
-       return 0;
+out:
+       unlock_kernel();
+       return ret;
 }
 
 static int pg_release(struct inode *inode, struct file *file)
@@ -676,8 +686,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 +705,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);