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

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 14ea57f963bb61d41f52bd040aa36bc13a31b25d..579041ded4bedfeb254cdf468642411846327e65 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -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;
 

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 40d2b46cbc79f8bb452b7521d8b56759ac7bcd4a..9c17d1add260ca1aa1eebbbe6ac34c261bc195cd 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -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) {

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 89c3e496f1edf29c8bf13731b995e915acba2ca2..5ec6291e967f0078acb8598372c9014a3ba34046 100644 (file)
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -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);
 }

diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 2d45e4df41639e407ed427c92ee473d38fa92119..0581edb9a560b76e245266883f4c1b1c1bb20126 100644 (file)
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -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;