summaryrefslogtreecommitdiffstats
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
authorgregkh@suse.de <gregkh@suse.de>2005-03-15 14:26:30 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-20 15:15:04 -0700
commit1235686f6e67cf30c460eb77d90a6cb4be57b92f (patch)
treec7ef368a38c8e0c64e09d9e0e8a2a93392a1732c /drivers/input/joydev.c
parent7fe845d11ad1b4aac098d40c55275569e143c483 (diff)
downloadlinux-stable-1235686f6e67cf30c460eb77d90a6cb4be57b92f.tar.gz
linux-stable-1235686f6e67cf30c460eb77d90a6cb4be57b92f.tar.bz2
linux-stable-1235686f6e67cf30c460eb77d90a6cb4be57b92f.zip
[PATCH] INPUT: move to use the new class code, instead of class_simple
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r--drivers/input/joydev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 627d343dfba1..39775fc380c7 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -452,9 +452,9 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
devfs_mk_cdev(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
S_IFCHR|S_IRUGO|S_IWUSR, "input/js%d", minor);
- class_simple_device_add(input_class,
- MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
- dev->dev, "js%d", minor);
+ class_device_create(input_class,
+ MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
+ dev->dev, "js%d", minor);
return &joydev->handle;
}
@@ -464,7 +464,7 @@ static void joydev_disconnect(struct input_handle *handle)
struct joydev *joydev = handle->private;
struct joydev_list *list;
- class_simple_device_remove(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
+ class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
devfs_remove("input/js%d", joydev->minor);
joydev->exist = 0;