Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / drivers / block / paride / pt.c

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index c902b25e48697d938179d7002ea7522fab5aad93..8b9549ab4a4e6eafd21b2e38b835618448cf31d9 100644 (file)
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -232,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,
@@ -660,11 +660,11 @@ static int pt_open(struct inode *inode, struct file *file)
        pt_identify(tape);
 
        err = -ENODEV;
-       if (!tape->flags & PT_MEDIA)
+       if (!(tape->flags & PT_MEDIA))
                goto out;
 
        err = -EROFS;
-       if ((!tape->flags & PT_WRITE_OK) && (file->f_mode & 2))
+       if ((!(tape->flags & PT_WRITE_OK)) && (file->f_mode & 2))
                goto out;
 
        if (!(iminor(inode) & 128))
@@ -972,10 +972,10 @@ static int __init pt_init(void)
 
        for (unit = 0; unit < PT_UNITS; unit++)
                if (pt[unit].present) {
-                       class_device_create(pt_class, NULL, MKDEV(major, unit),
-                                       NULL, "pt%d", unit);
-                       class_device_create(pt_class, NULL, MKDEV(major, unit + 128),
-                                       NULL, "pt%dn", unit);
+                       device_create(pt_class, NULL, MKDEV(major, unit),
+                                     "pt%d", unit);
+                       device_create(pt_class, NULL, MKDEV(major, unit + 128),
+                                     "pt%dn", unit);
                }
        goto out;
 
@@ -990,8 +990,8 @@ static void __exit pt_exit(void)
        int unit;
        for (unit = 0; unit < PT_UNITS; unit++)
                if (pt[unit].present) {
-                       class_device_destroy(pt_class, MKDEV(major, unit));
-                       class_device_destroy(pt_class, MKDEV(major, unit + 128));
+                       device_destroy(pt_class, MKDEV(major, unit));
+                       device_destroy(pt_class, MKDEV(major, unit + 128));
                }
        class_destroy(pt_class);
        unregister_chrdev(major, name);