[PATCH] INPUT: move the input class devices under their new input_dev devices

[powerpc.git] / drivers / input / tsdev.c

diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 50c63a1..0581edb 100644 (file)
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -53,7 +53,6 @@
 #include <linux/random.h>
 #include <linux/time.h>
 #include <linux/device.h>
-#include <linux/devfs_fs_kernel.h>
 
 #ifndef CONFIG_INPUT_TSDEV_SCREEN_X
 #define CONFIG_INPUT_TSDEV_SCREEN_X    240
@@ -410,13 +409,9 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
 
        tsdev_table[minor] = tsdev;
 
-       devfs_mk_cdev(MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
-                       S_IFCHR|S_IRUGO|S_IWUSR, "input/ts%d", minor);
-       devfs_mk_cdev(MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor + TSDEV_MINORS/2),
-                       S_IFCHR|S_IRUGO|S_IWUSR, "input/tsraw%d", minor);
-       class_device_create(input_class,
+       class_device_create(&input_dev_class, &dev->cdev,
                        MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
-                       dev->dev, "ts%d", minor);
+                       dev->cdev.dev, "ts%d", minor);
 
        return &tsdev->handle;
 }
@@ -426,10 +421,8 @@ static void tsdev_disconnect(struct input_handle *handle)
        struct tsdev *tsdev = handle->private;
        struct tsdev_list *list;
 
-       class_device_destroy(input_class,
+       class_device_destroy(&input_dev_class,
                        MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
-       devfs_remove("input/ts%d", tsdev->minor);
-       devfs_remove("input/tsraw%d", tsdev->minor);
        tsdev->exist = 0;
 
        if (tsdev->open) {