git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
input
/
input.c
diff --git
a/drivers/input/input.c
b/drivers/input/input.c
index
416084b
..
6ff0f38
100644
(file)
--- a/
drivers/input/input.c
+++ b/
drivers/input/input.c
@@
-17,9
+17,8
@@
#include <linux/module.h>
#include <linux/random.h>
#include <linux/major.h>
#include <linux/module.h>
#include <linux/random.h>
#include <linux/major.h>
-#include <linux/pm.h>
#include <linux/proc_fs.h>
#include <linux/proc_fs.h>
-#include <linux/k
mod
.h>
+#include <linux/k
object_uevent
.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/device.h>
@@
-67,13
+66,10
@@
void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
{
struct input_handle *handle;
{
struct input_handle *handle;
- if (dev->pm_dev)
- pm_access(dev->pm_dev);
-
if (type > EV_MAX || !test_bit(type, dev->evbit))
return;
if (type > EV_MAX || !test_bit(type, dev->evbit))
return;
- add_
mouse_randomness((type << 4) ^ code ^ (code >> 4) ^
value);
+ add_
input_randomness(type, code,
value);
switch (type) {
switch (type) {
@@
-230,8
+226,6
@@
void input_release_device(struct input_handle *handle)
int input_open_device(struct input_handle *handle)
{
int input_open_device(struct input_handle *handle)
{
- if (handle->dev->pm_dev)
- pm_access(handle->dev->pm_dev);
handle->open++;
if (handle->dev->open)
return handle->dev->open(handle->dev);
handle->open++;
if (handle->dev->open)
return handle->dev->open(handle->dev);
@@
-249,8
+243,6
@@
int input_flush_device(struct input_handle* handle, struct file* file)
void input_close_device(struct input_handle *handle)
{
input_release_device(handle);
void input_close_device(struct input_handle *handle)
{
input_release_device(handle);
- if (handle->dev->pm_dev)
- pm_dev_idle(handle->dev->pm_dev);
if (handle->dev->close)
handle->dev->close(handle->dev);
handle->open--;
if (handle->dev->close)
handle->dev->close(handle->dev);
handle->open--;
@@
-468,9
+460,6
@@
void input_unregister_device(struct input_dev *dev)
if (!dev) return;
if (!dev) return;
- if (dev->pm_dev)
- pm_unregister(dev->pm_dev);
-
del_timer_sync(&dev->timer);
list_for_each_safe(node, next, &dev->h_list) {
del_timer_sync(&dev->timer);
list_for_each_safe(node, next, &dev->h_list) {