[PATCH] cleanup input_register_minor

Always pass the input/ prefix to input_register_minor instead of using
the first argument to devfs_register

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index a8ecde6cee15f2e82f0ebf2e973f33fbdd457709..9a70680b18f6dcea07bdefe1f2c56e6a54d9a2ca 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -397,7 +397,7 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct
        sprintf(evdev->name, "event%d", minor);
 
        evdev_table[minor] = evdev;
-       evdev->devfs = input_register_minor("event%d", minor, EVDEV_MINOR_BASE);
+       evdev->devfs = input_register_minor("input/event%d", minor, EVDEV_MINOR_BASE);
 
        return &evdev->handle;
 }

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 30796fc98f74a4da5bb6d83221dcd5fb6ecc8203..5f48e85e2c328c01be5058830137937b094b9635 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -546,8 +546,11 @@ devfs_handle_t input_register_minor(char *name, int minor, int minor_base)
 {
        char devfs_name[16];
        sprintf(devfs_name, name, minor);
-       return devfs_register(input_devfs_handle, devfs_name, DEVFS_FL_DEFAULT, INPUT_MAJOR, minor + minor_base,
-               S_IFCHR | S_IRUGO | S_IWUSR, &input_fops, NULL);
+
+       return devfs_register(NULL, devfs_name, 0,
+                       INPUT_MAJOR, minor + minor_base,
+                       S_IFCHR|S_IRUGO|S_IWUSR,
+                       &input_fops, NULL);
 }
 
 void input_unregister_minor(devfs_handle_t handle)

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 5dc38a594c262a2f839c20eec48fe5e5b6416751..57c6062a96d33ad9d735eb178d53734ef8c0275e 100644 (file)
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -425,7 +425,7 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru
                input_open_device(&mousedev->handle);
 
        mousedev_table[minor] = mousedev;
-       mousedev->devfs = input_register_minor("mouse%d", minor, MOUSEDEV_MINOR_BASE);
+       mousedev->devfs = input_register_minor("input/mouse%d", minor, MOUSEDEV_MINOR_BASE);
 
        return &mousedev->handle;
 }
@@ -507,7 +507,7 @@ static int __init mousedev_init(void)
        mousedev_table[MOUSEDEV_MIX] = &mousedev_mix;
        mousedev_mix.exist = 1;
        mousedev_mix.minor = MOUSEDEV_MIX;
-       mousedev_mix.devfs = input_register_minor("mice", MOUSEDEV_MIX, MOUSEDEV_MINOR_BASE);
+       mousedev_mix.devfs = input_register_minor("input/mice", MOUSEDEV_MIX, MOUSEDEV_MINOR_BASE);
 
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
        if (!(mousedev_mix.misc = !misc_register(&psaux_mouse)))

diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 07f370798b41650f15072f507be60b949f9e4691..3e7184548ee44fbf12a72d9929e6421e24d09547 100644 (file)
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -326,7 +326,7 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
 
        tsdev_table[minor] = tsdev;
        tsdev->devfs =
-           input_register_minor("ts%d", minor, TSDEV_MINOR_BASE);
+           input_register_minor("input/ts%d", minor, TSDEV_MINOR_BASE);
 
 
        return &tsdev->handle;