[PATCH] INPUT: move the input class devices under their new input_dev devices
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
23d5090161
commit
967ca69216
|
@ -686,9 +686,9 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct
|
|||
|
||||
evdev_table[minor] = evdev;
|
||||
|
||||
class_device_create(input_class, NULL,
|
||||
class_device_create(&input_dev_class, &dev->cdev,
|
||||
MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
|
||||
dev->dev, "event%d", minor);
|
||||
dev->cdev.dev, "event%d", minor);
|
||||
|
||||
return &evdev->handle;
|
||||
}
|
||||
|
@ -698,7 +698,7 @@ static void evdev_disconnect(struct input_handle *handle)
|
|||
struct evdev *evdev = handle->private;
|
||||
struct evdev_list *list;
|
||||
|
||||
class_device_destroy(input_class,
|
||||
class_device_destroy(&input_dev_class,
|
||||
MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
|
||||
evdev->exist = 0;
|
||||
|
||||
|
|
|
@ -513,9 +513,9 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
|
|||
|
||||
joydev_table[minor] = joydev;
|
||||
|
||||
class_device_create(input_class, NULL,
|
||||
class_device_create(&input_dev_class, &dev->cdev,
|
||||
MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
|
||||
dev->dev, "js%d", minor);
|
||||
dev->cdev.dev, "js%d", minor);
|
||||
|
||||
return &joydev->handle;
|
||||
}
|
||||
|
@ -525,7 +525,7 @@ static void joydev_disconnect(struct input_handle *handle)
|
|||
struct joydev *joydev = handle->private;
|
||||
struct joydev_list *list;
|
||||
|
||||
class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
|
||||
class_device_destroy(&input_dev_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
|
||||
joydev->exist = 0;
|
||||
|
||||
if (joydev->open) {
|
||||
|
|
|
@ -648,9 +648,9 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru
|
|||
|
||||
mousedev_table[minor] = mousedev;
|
||||
|
||||
class_device_create(input_class, NULL,
|
||||
class_device_create(&input_dev_class, &dev->cdev,
|
||||
MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
|
||||
dev->dev, "mouse%d", minor);
|
||||
dev->cdev.dev, "mouse%d", minor);
|
||||
|
||||
return &mousedev->handle;
|
||||
}
|
||||
|
@ -660,7 +660,7 @@ static void mousedev_disconnect(struct input_handle *handle)
|
|||
struct mousedev *mousedev = handle->private;
|
||||
struct mousedev_list *list;
|
||||
|
||||
class_device_destroy(input_class,
|
||||
class_device_destroy(&input_dev_class,
|
||||
MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
|
||||
mousedev->exist = 0;
|
||||
|
||||
|
@ -734,7 +734,7 @@ static int __init mousedev_init(void)
|
|||
mousedev_mix.exist = 1;
|
||||
mousedev_mix.minor = MOUSEDEV_MIX;
|
||||
|
||||
class_device_create(input_class, NULL,
|
||||
class_device_create(&input_dev_class, NULL,
|
||||
MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice");
|
||||
|
||||
#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
|
||||
|
@ -753,7 +753,7 @@ static void __exit mousedev_exit(void)
|
|||
if (psaux_registered)
|
||||
misc_deregister(&psaux_mouse);
|
||||
#endif
|
||||
class_device_destroy(input_class,
|
||||
class_device_destroy(&input_dev_class,
|
||||
MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX));
|
||||
input_unregister_handler(&mousedev_handler);
|
||||
}
|
||||
|
|
|
@ -409,9 +409,9 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
|
|||
|
||||
tsdev_table[minor] = tsdev;
|
||||
|
||||
class_device_create(input_class, NULL,
|
||||
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;
|
||||
}
|
||||
|
@ -421,7 +421,7 @@ 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));
|
||||
tsdev->exist = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue