1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 17fd6d46d082..966b8868f792 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -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;