diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 16:08:05 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 16:10:18 -0700 |
| commit | 7e044e056a6aa0dc695db50461d7b326fde15e8b (patch) | |
| tree | bc0a26dbd140e54e1cfa9d67ad93ad890f50775f /include/linux | |
| parent | 6f660f12d703fa23069317f0a64c6b75d08c15c2 (diff) | |
| download | op-kernel-dev-7e044e056a6aa0dc695db50461d7b326fde15e8b.zip op-kernel-dev-7e044e056a6aa0dc695db50461d7b326fde15e8b.tar.gz | |
Input: serio - do not use deprecated dev.power.power_state
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/gameport.h | 3 | ||||
| -rw-r--r-- | include/linux/serio.h | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 0cd825f..1bc0854 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h @@ -11,6 +11,7 @@ #ifdef __KERNEL__ #include <asm/io.h> +#include <linux/types.h> #include <linux/list.h> #include <linux/mutex.h> #include <linux/device.h> @@ -62,7 +63,7 @@ struct gameport_driver { struct device_driver driver; - unsigned int ignore; + bool ignore; }; #define to_gameport_driver(d) container_of(d, struct gameport_driver, driver) diff --git a/include/linux/serio.h b/include/linux/serio.h index e0417e4..126d24c 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h @@ -15,6 +15,7 @@ #ifdef __KERNEL__ +#include <linux/types.h> #include <linux/interrupt.h> #include <linux/list.h> #include <linux/spinlock.h> @@ -28,7 +29,10 @@ struct serio { char name[32]; char phys[32]; - unsigned int manual_bind; + bool manual_bind; + bool registered; /* port has been fully registered with driver core */ + bool suspended; /* port is suspended */ + struct serio_device_id id; @@ -47,7 +51,6 @@ struct serio { struct mutex drv_mutex; /* protects serio->drv so attributes can pin driver */ struct device dev; - unsigned int registered; /* port has been fully registered with driver core */ struct list_head node; }; @@ -58,7 +61,7 @@ struct serio_driver { char *description; struct serio_device_id *id_table; - unsigned int manual_bind; + bool manual_bind; void (*write_wakeup)(struct serio *); irqreturn_t (*interrupt)(struct serio *, unsigned char, unsigned int); |
