diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-14 01:32:28 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-14 01:32:28 -0400 |
| commit | 68c2a1607cd6dd12427c9566b39756e92708713c (patch) | |
| tree | c3fc9a44a66f90bbdb08426886f14c664dfbaffc | |
| parent | 655816e49867082d13ece0da31d76e12cc0de4a5 (diff) | |
| download | linux-68c2a1607cd6dd12427c9566b39756e92708713c.tar.gz linux-68c2a1607cd6dd12427c9566b39756e92708713c.tar.bz2 linux-68c2a1607cd6dd12427c9566b39756e92708713c.zip | |
Input: remove cruft that was needed for transition to sysfs
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/input.c | 10 | ||||
| -rw-r--r-- | include/linux/input.h | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index f2c85a60a0dc..c3448364cc73 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -906,7 +906,6 @@ struct input_dev *input_allocate_device(void) dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL); if (dev) { - dev->dynalloc = 1; dev->cdev.class = &input_class; class_device_initialize(&dev->cdev); mutex_init(&dev->mutex); @@ -942,13 +941,6 @@ int input_register_device(struct input_dev *dev) const char *path; int error; - if (!dev->dynalloc) { - printk(KERN_WARNING "input: device %s is statically allocated, will not register\n" - "Please convert to input_allocate_device() or contact dtor_core@ameritech.net\n", - dev->name ? dev->name : "<Unknown>"); - return -EINVAL; - } - set_bit(EV_SYN, dev->evbit); /* @@ -964,10 +956,8 @@ int input_register_device(struct input_dev *dev) dev->rep[REP_PERIOD] = 33; } - INIT_LIST_HEAD(&dev->h_list); list_add_tail(&dev->node, &input_dev_list); - dev->cdev.class = &input_class; snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id), "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1); diff --git a/include/linux/input.h b/include/linux/input.h index 300036b7755a..155b2bc96842 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -978,9 +978,6 @@ struct input_dev { unsigned int users; struct class_device cdev; - struct device *dev; /* will be removed soon */ - - int dynalloc; /* temporarily */ struct list_head h_list; struct list_head node; @@ -1093,12 +1090,6 @@ struct input_handle { #define to_handle(n) container_of(n,struct input_handle,d_node) #define to_handle_h(n) container_of(n,struct input_handle,h_node) -static inline void init_input_dev(struct input_dev *dev) -{ - INIT_LIST_HEAD(&dev->h_list); - INIT_LIST_HEAD(&dev->node); -} - struct input_dev *input_allocate_device(void); void input_free_device(struct input_dev *dev); |