1 files changed, 1 insertions, 36 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 003587c71f43..19d09431addd 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -67,42 +67,7 @@ static const struct alps_model_info alps_model_data[] = {
 * isn't valid per PS/2 spec.
 */
-/*
+/* Packet formats are described in Documentation/input/alps.txt */
- * PS/2 packet format
- *
- * byte 0:  0    0 YSGN XSGN    1    M    R    L
- * byte 1: X7   X6   X5   X4   X3   X2   X1   X0
- * byte 2: Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0
- *
- * Note that the device never signals overflow condition.
- *
- * ALPS absolute Mode - new format
- *
- * byte 0:  1    ?    ?    ?    1    ?    ?    ?
- * byte 1:  0   x6   x5   x4   x3   x2   x1   x0
- * byte 2:  0  x10   x9   x8   x7    ?  fin  ges
- * byte 3:  0   y9   y8   y7    1    M    R    L
- * byte 4:  0   y6   y5   y4   y3   y2   y1   y0
- * byte 5:  0   z6   z5   z4   z3   z2   z1   z0
- *
- * Dualpoint device -- interleaved packet format
- *
- * byte 0:    1    1    0    0    1    1    1    1
- * byte 1:    0   x6   x5   x4   x3   x2   x1   x0
- * byte 2:    0  x10   x9   x8   x7    0  fin  ges
- * byte 3:    0    0 YSGN XSGN    1    1    1    1
- * byte 4:   X7   X6   X5   X4   X3   X2   X1   X0
- * byte 5:   Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0
- * byte 6:    0   y9   y8   y7    1    m    r    l
- * byte 7:    0   y6   y5   y4   y3   y2   y1   y0
- * byte 8:    0   z6   z5   z4   z3   z2   z1   z0
- *
- * CAPITALS = stick, miniscules = touchpad
- *
- * ?'s can have different meanings on different models,
- * such as wheel rotation, extra buttons, stick buttons
- * on a dualpoint, etc.
- */
 static bool alps_is_valid_first_byte(const struct alps_model_info *model,
                                     unsigned char data)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 003587c71f43..19d09431addd 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c
@@ -67,42 +67,7 @@ static const struct alps_model_info alps_model_data[] = {
67	* isn't valid per PS/2 spec.	67	* isn't valid per PS/2 spec.
68	*/	68	*/
69		69
70	/*	70	/* Packet formats are described in Documentation/input/alps.txt */
71	* PS/2 packet format
72	*
73	* byte 0: 0 0 YSGN XSGN 1 M R L
74	* byte 1: X7 X6 X5 X4 X3 X2 X1 X0
75	* byte 2: Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0
76	*
77	* Note that the device never signals overflow condition.
78	*
79	* ALPS absolute Mode - new format
80	*
81	* byte 0: 1 ? ? ? 1 ? ? ?
82	* byte 1: 0 x6 x5 x4 x3 x2 x1 x0
83	* byte 2: 0 x10 x9 x8 x7 ? fin ges
84	* byte 3: 0 y9 y8 y7 1 M R L
85	* byte 4: 0 y6 y5 y4 y3 y2 y1 y0
86	* byte 5: 0 z6 z5 z4 z3 z2 z1 z0
87	*
88	* Dualpoint device -- interleaved packet format
89	*
90	* byte 0: 1 1 0 0 1 1 1 1
91	* byte 1: 0 x6 x5 x4 x3 x2 x1 x0
92	* byte 2: 0 x10 x9 x8 x7 0 fin ges
93	* byte 3: 0 0 YSGN XSGN 1 1 1 1
94	* byte 4: X7 X6 X5 X4 X3 X2 X1 X0
95	* byte 5: Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0
96	* byte 6: 0 y9 y8 y7 1 m r l
97	* byte 7: 0 y6 y5 y4 y3 y2 y1 y0
98	* byte 8: 0 z6 z5 z4 z3 z2 z1 z0
99	*
100	* CAPITALS = stick, miniscules = touchpad
101	*
102	* ?'s can have different meanings on different models,
103	* such as wheel rotation, extra buttons, stick buttons
104	* on a dualpoint, etc.
105	*/
106		71
107	static bool alps_is_valid_first_byte(const struct alps_model_info *model,	72	static bool alps_is_valid_first_byte(const struct alps_model_info *model,
108	unsigned char data)	73	unsigned char data)