Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / char / ppdev.c

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 5eda075..520d2cf 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -60,15 +60,15 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/device.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/ioctl.h>
 #include <linux/parport.h>
 #include <linux/ctype.h>
 #include <linux/poll.h>
-#include <asm/uaccess.h>
+#include <linux/major.h>
 #include <linux/ppdev.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
+#include <asm/uaccess.h>
 
 #define PP_VERSION "ppdev: user-space parallel port driver"
 #define CHRDEV "ppdev"
@@ -737,9 +737,9 @@ static unsigned int pp_poll (struct file * file, poll_table * wait)
        return mask;
 }
 
-static struct class_simple *ppdev_class;
+static struct class *ppdev_class;
 
-static struct file_operations pp_fops = {
+static const struct file_operations pp_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .read           = pp_read,
@@ -752,13 +752,13 @@ static struct file_operations pp_fops = {
 
 static void pp_attach(struct parport *port)
 {
-       class_simple_device_add(ppdev_class, MKDEV(PP_MAJOR, port->number),
+       class_device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number),
                        NULL, "parport%d", port->number);
 }
 
 static void pp_detach(struct parport *port)
 {
-       class_simple_device_remove(MKDEV(PP_MAJOR, port->number));
+       class_device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number));
 }
 
 static struct parport_driver pp_driver = {
@@ -769,23 +769,18 @@ static struct parport_driver pp_driver = {
 
 static int __init ppdev_init (void)
 {
-       int i, err = 0;
+       int err = 0;
 
        if (register_chrdev (PP_MAJOR, CHRDEV, &pp_fops)) {
                printk (KERN_WARNING CHRDEV ": unable to get major %d\n",
                        PP_MAJOR);
                return -EIO;
        }
-       ppdev_class = class_simple_create(THIS_MODULE, CHRDEV);
+       ppdev_class = class_create(THIS_MODULE, CHRDEV);
        if (IS_ERR(ppdev_class)) {
                err = PTR_ERR(ppdev_class);
                goto out_chrdev;
        }
-       devfs_mk_dir("parports");
-       for (i = 0; i < PARPORT_MAX; i++) {
-               devfs_mk_cdev(MKDEV(PP_MAJOR, i),
-                               S_IFCHR | S_IRUGO | S_IWUGO, "parports/%d", i);
-       }
        if (parport_register_driver(&pp_driver)) {
                printk (KERN_WARNING CHRDEV ": unable to register with parport\n");
                goto out_class;
@@ -795,10 +790,7 @@ static int __init ppdev_init (void)
        goto out;
 
 out_class:
-       for (i = 0; i < PARPORT_MAX; i++)
-               devfs_remove("parports/%d", i);
-       devfs_remove("parports");
-       class_simple_destroy(ppdev_class);
+       class_destroy(ppdev_class);
 out_chrdev:
        unregister_chrdev(PP_MAJOR, CHRDEV);
 out:
@@ -807,13 +799,9 @@ out:
 
 static void __exit ppdev_cleanup (void)
 {
-       int i;
        /* Clean up all parport stuff */
-       for (i = 0; i < PARPORT_MAX; i++)
-               devfs_remove("parports/%d", i);
        parport_unregister_driver(&pp_driver);
-       devfs_remove("parports");
-       class_simple_destroy(ppdev_class);
+       class_destroy(ppdev_class);
        unregister_chrdev (PP_MAJOR, CHRDEV);
 }