Input: simplify name handling for certain input handles
For evdev, joydev and mousedev, instead of having a separate character array holding name of the handle, use struct devce's name which is the same. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
committed by
Dmitry Torokhov
parent
7e044e056a
commit
3d5cb60ef3
@@ -60,7 +60,6 @@ struct mousedev {
|
||||
int exist;
|
||||
int open;
|
||||
int minor;
|
||||
char name[16];
|
||||
struct input_handle handle;
|
||||
wait_queue_head_t wait;
|
||||
struct list_head client_list;
|
||||
@@ -863,19 +862,17 @@ static struct mousedev *mousedev_create(struct input_dev *dev,
|
||||
init_waitqueue_head(&mousedev->wait);
|
||||
|
||||
if (minor == MOUSEDEV_MIX)
|
||||
strlcpy(mousedev->name, "mice", sizeof(mousedev->name));
|
||||
dev_set_name(&mousedev->dev, "mice");
|
||||
else
|
||||
snprintf(mousedev->name, sizeof(mousedev->name),
|
||||
"mouse%d", minor);
|
||||
dev_set_name(&mousedev->dev, "mouse%d", minor);
|
||||
|
||||
mousedev->minor = minor;
|
||||
mousedev->exist = 1;
|
||||
mousedev->handle.dev = input_get_device(dev);
|
||||
mousedev->handle.name = mousedev->name;
|
||||
mousedev->handle.name = dev_name(&mousedev->dev);
|
||||
mousedev->handle.handler = handler;
|
||||
mousedev->handle.private = mousedev;
|
||||
|
||||
dev_set_name(&mousedev->dev, mousedev->name);
|
||||
mousedev->dev.class = &input_class;
|
||||
if (dev)
|
||||
mousedev->dev.parent = &dev->dev;
|
||||
|
Reference in New Issue
Block a user