aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/serio.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/serio.h')
-rw-r--r--include/linux/serio.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 95674d97dabd..25641d9e0ea8 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -87,11 +87,10 @@ void serio_unregister_port(struct serio *serio);
87void serio_unregister_child_port(struct serio *serio); 87void serio_unregister_child_port(struct serio *serio);
88 88
89int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name); 89int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name);
90static inline int serio_register_driver(struct serio_driver *drv) 90static inline int __must_check serio_register_driver(struct serio_driver *drv)
91{ 91{
92 return __serio_register_driver(drv, THIS_MODULE, KBUILD_MODNAME); 92 return __serio_register_driver(drv, THIS_MODULE, KBUILD_MODNAME);
93} 93}
94int serio_register_driver(struct serio_driver *drv);
95void serio_unregister_driver(struct serio_driver *drv); 94void serio_unregister_driver(struct serio_driver *drv);
96 95
97static inline int serio_write(struct serio *serio, unsigned char data) 96static inline int serio_write(struct serio *serio, unsigned char data)
@@ -175,7 +174,7 @@ static inline void serio_unpin_driver(struct serio *serio)
175#define SERIO_8042_XL 0x06 174#define SERIO_8042_XL 0x06
176 175
177/* 176/*
178 * Serio types 177 * Serio protocols
179 */ 178 */
180#define SERIO_UNKNOWN 0x00 179#define SERIO_UNKNOWN 0x00
181#define SERIO_MSC 0x01 180#define SERIO_MSC 0x01
@@ -212,5 +211,7 @@ static inline void serio_unpin_driver(struct serio *serio)
212#define SERIO_TAOSEVM 0x34 211#define SERIO_TAOSEVM 0x34
213#define SERIO_FUJITSU 0x35 212#define SERIO_FUJITSU 0x35
214#define SERIO_ZHENHUA 0x36 213#define SERIO_ZHENHUA 0x36
214#define SERIO_INEXIO 0x37
215#define SERIO_TOUCHIT213 0x37
215 216
216#endif 217#endif