diff options
Diffstat (limited to 'drivers/input/evbug.c')
-rw-r--r-- | drivers/input/evbug.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c index c21f2f127234..0353601ac3b5 100644 --- a/drivers/input/evbug.c +++ b/drivers/input/evbug.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: evbug.c,v 1.10 2001/09/25 10:12:07 vojtech Exp $ | ||
3 | * | ||
4 | * Copyright (c) 1999-2001 Vojtech Pavlik | 2 | * Copyright (c) 1999-2001 Vojtech Pavlik |
5 | */ | 3 | */ |
6 | 4 | ||
@@ -41,7 +39,7 @@ MODULE_LICENSE("GPL"); | |||
41 | static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value) | 39 | static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value) |
42 | { | 40 | { |
43 | printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", | 41 | printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", |
44 | handle->dev->phys, type, code, value); | 42 | handle->dev->dev.bus_id, type, code, value); |
45 | } | 43 | } |
46 | 44 | ||
47 | static int evbug_connect(struct input_handler *handler, struct input_dev *dev, | 45 | static int evbug_connect(struct input_handler *handler, struct input_dev *dev, |
@@ -66,7 +64,10 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, | |||
66 | if (error) | 64 | if (error) |
67 | goto err_unregister_handle; | 65 | goto err_unregister_handle; |
68 | 66 | ||
69 | printk(KERN_DEBUG "evbug.c: Connected device: \"%s\", %s\n", dev->name, dev->phys); | 67 | printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n", |
68 | dev->dev.bus_id, | ||
69 | dev->name ?: "unknown", | ||
70 | dev->phys ?: "unknown"); | ||
70 | 71 | ||
71 | return 0; | 72 | return 0; |
72 | 73 | ||
@@ -79,7 +80,8 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, | |||
79 | 80 | ||
80 | static void evbug_disconnect(struct input_handle *handle) | 81 | static void evbug_disconnect(struct input_handle *handle) |
81 | { | 82 | { |
82 | printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", handle->dev->phys); | 83 | printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", |
84 | handle->dev->dev.bus_id); | ||
83 | 85 | ||
84 | input_close_device(handle); | 86 | input_close_device(handle); |
85 | input_unregister_handle(handle); | 87 | input_unregister_handle(handle); |