Input: evbug - identify device by its sysfs ID

This should help with devices that don't set up their phys or name
since sysfs ID is always present.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c
index 67754c776d8856fb14fa6a6e32a1c0430d4fccc3..0353601ac3b575e9a7e968387ec22d10fb88c04e 100644 (file)
--- a/drivers/input/evbug.c
+++ b/drivers/input/evbug.c
@@ -39,7 +39,7 @@ MODULE_LICENSE("GPL");
 static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
        printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n",
-               handle->dev->phys, type, code, value);
+               handle->dev->dev.bus_id, type, code, value);
 }
 
 static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
@@ -64,7 +64,10 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
        if (error)
                goto err_unregister_handle;
 
-       printk(KERN_DEBUG "evbug.c: Connected device: \"%s\", %s\n", dev->name, dev->phys);
+       printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n",
+               dev->dev.bus_id,
+               dev->name ?: "unknown",
+               dev->phys ?: "unknown");
 
        return 0;
 
@@ -77,7 +80,8 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
 
 static void evbug_disconnect(struct input_handle *handle)
 {
-       printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", handle->dev->phys);
+       printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n",
+               handle->dev->dev.bus_id);
 
        input_close_device(handle);
        input_unregister_handle(handle);