cleanup input_register_minor
PATCH 1/1 cleanup input_register_minor
Always pass the input/ prefix to input_register_minor instead of using the first argument to devfs_register
drivers/input/evdev.c +1 -1
@@ -397,7 +397,7 @@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; }
drivers/input/input.c +5 -2
@@ -546,8 +546,11 @@ {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)
drivers/input/mousedev.c +2 -2
@@ -425,7 +425,7 @@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 @@ 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)))
drivers/input/tsdev.c +1 -1
@@ -326,7 +326,7 @@ 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;