diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-30 00:07:50 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-30 09:29:05 -0400 |
commit | a6c2490f010d9235b1424110c6f414460e41dfe1 (patch) | |
tree | 2c7d6773739791bfa0510e1ea27e88a3e5ab4cdb /drivers/input/evbug.c | |
parent | dde4ac07263161264d089c7556d0295487787b77 (diff) |
Input: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/evbug.c')
-rw-r--r-- | drivers/input/evbug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c index 0353601ac3b..f7c5c14ec12 100644 --- a/drivers/input/evbug.c +++ b/drivers/input/evbug.c | |||
@@ -39,7 +39,7 @@ MODULE_LICENSE("GPL"); | |||
39 | 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) |
40 | { | 40 | { |
41 | 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", |
42 | handle->dev->dev.bus_id, type, code, value); | 42 | dev_name(&handle->dev->dev), type, code, value); |
43 | } | 43 | } |
44 | 44 | ||
45 | 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, |
@@ -65,7 +65,7 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, | |||
65 | goto err_unregister_handle; | 65 | goto err_unregister_handle; |
66 | 66 | ||
67 | printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n", | 67 | printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n", |
68 | dev->dev.bus_id, | 68 | dev_name(&dev->dev), |
69 | dev->name ?: "unknown", | 69 | dev->name ?: "unknown", |
70 | dev->phys ?: "unknown"); | 70 | dev->phys ?: "unknown"); |
71 | 71 | ||
@@ -81,7 +81,7 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, | |||
81 | static void evbug_disconnect(struct input_handle *handle) | 81 | static void evbug_disconnect(struct input_handle *handle) |
82 | { | 82 | { |
83 | printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", | 83 | printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", |
84 | handle->dev->dev.bus_id); | 84 | dev_name(&handle->dev->dev)); |
85 | 85 | ||
86 | input_close_device(handle); | 86 | input_close_device(handle); |
87 | input_unregister_handle(handle); | 87 | input_unregister_handle(handle); |