diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/input.c | 10 |
1 files changed, 0 insertions, 10 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) | |||
906 | 906 | ||
907 | dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL); | 907 | dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL); |
908 | if (dev) { | 908 | if (dev) { |
909 | dev->dynalloc = 1; | ||
910 | dev->cdev.class = &input_class; | 909 | dev->cdev.class = &input_class; |
911 | class_device_initialize(&dev->cdev); | 910 | class_device_initialize(&dev->cdev); |
912 | mutex_init(&dev->mutex); | 911 | mutex_init(&dev->mutex); |
@@ -942,13 +941,6 @@ int input_register_device(struct input_dev *dev) | |||
942 | const char *path; | 941 | const char *path; |
943 | int error; | 942 | int error; |
944 | 943 | ||
945 | if (!dev->dynalloc) { | ||
946 | printk(KERN_WARNING "input: device %s is statically allocated, will not register\n" | ||
947 | "Please convert to input_allocate_device() or contact dtor_core@ameritech.net\n", | ||
948 | dev->name ? dev->name : "<Unknown>"); | ||
949 | return -EINVAL; | ||
950 | } | ||
951 | |||
952 | set_bit(EV_SYN, dev->evbit); | 944 | set_bit(EV_SYN, dev->evbit); |
953 | 945 | ||
954 | /* | 946 | /* |
@@ -964,10 +956,8 @@ int input_register_device(struct input_dev *dev) | |||
964 | dev->rep[REP_PERIOD] = 33; | 956 | dev->rep[REP_PERIOD] = 33; |
965 | } | 957 | } |
966 | 958 | ||
967 | INIT_LIST_HEAD(&dev->h_list); | ||
968 | list_add_tail(&dev->node, &input_dev_list); | 959 | list_add_tail(&dev->node, &input_dev_list); |
969 | 960 | ||
970 | dev->cdev.class = &input_class; | ||
971 | snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id), | 961 | snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id), |
972 | "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1); | 962 | "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1); |
973 | 963 | ||