Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
0370010b
Commit
0370010b
authored
May 09, 2004
by
Dmitry Torokhov
Committed by
Vojtech Pavlik
May 09, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Input: trailing whitespace fixes in drivers/input/serio
parent
3a53ff4d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
38 deletions
+38
-38
drivers/input/serio/98kbd-io.c
drivers/input/serio/98kbd-io.c
+2
-2
drivers/input/serio/ct82c710.c
drivers/input/serio/ct82c710.c
+4
-4
drivers/input/serio/gscps2.c
drivers/input/serio/gscps2.c
+11
-11
drivers/input/serio/i8042.c
drivers/input/serio/i8042.c
+13
-13
drivers/input/serio/parkbd.c
drivers/input/serio/parkbd.c
+6
-6
drivers/input/serio/q40kbd.c
drivers/input/serio/q40kbd.c
+1
-1
drivers/input/serio/rpckbd.c
drivers/input/serio/rpckbd.c
+1
-1
No files found.
drivers/input/serio/98kbd-io.c
View file @
0370010b
...
...
@@ -42,8 +42,8 @@ MODULE_LICENSE("GPL");
* Register numbers.
*/
#define KBD98_COMMAND_REG 0x43
#define KBD98_STATUS_REG 0x43
#define KBD98_COMMAND_REG 0x43
#define KBD98_STATUS_REG 0x43
#define KBD98_DATA_REG 0x41
spinlock_t
kbd98io_lock
=
SPIN_LOCK_UNLOCKED
;
...
...
drivers/input/serio/ct82c710.c
View file @
0370010b
...
...
@@ -11,18 +11,18 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
* Should you need to contact me, the author, you can do so either by
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
...
...
drivers/input/serio/gscps2.c
View file @
0370010b
...
...
@@ -16,7 +16,7 @@
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*
* TODO:
* - Dino testing (did HP ever shipped a machine on which this port
* was usable/enabled ?)
...
...
@@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);
#define PFX "gscps2.c: "
/*
/*
* Driver constants
*/
...
...
@@ -222,7 +222,7 @@ static LIST_HEAD(ps2port_list);
/**
* gscps2_interrupt() - Interruption service routine
*
* This function reads received PS/2 bytes and processes them on
* This function reads received PS/2 bytes and processes them on
* all interfaces.
* The problematic part here is, that the keyboard and mouse PS/2 port
* share the same interrupt and it's not possible to send data if any
...
...
@@ -240,9 +240,9 @@ static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs)
unsigned
long
flags
;
spin_lock_irqsave
(
&
ps2port
->
lock
,
flags
);
while
(
(
ps2port
->
buffer
[
ps2port
->
append
].
str
=
while
(
(
ps2port
->
buffer
[
ps2port
->
append
].
str
=
gscps2_readb_status
(
ps2port
->
addr
))
&
GSC_STAT_RBNE
)
{
ps2port
->
buffer
[
ps2port
->
append
].
data
=
ps2port
->
buffer
[
ps2port
->
append
].
data
=
gscps2_readb_input
(
ps2port
->
addr
);
ps2port
->
append
=
((
ps2port
->
append
+
1
)
&
BUFFER_SIZE
);
}
...
...
@@ -349,7 +349,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
if
(
!
dev
->
irq
)
return
-
ENODEV
;
/* Offset for DINO PS/2. Works with LASI even */
if
(
dev
->
id
.
sversion
==
0x96
)
hpa
+=
GSC_DINO_OFFSET
;
...
...
@@ -368,7 +368,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
gscps2_reset
(
ps2port
);
ps2port
->
id
=
readb
(
ps2port
->
addr
+
GSC_ID
)
&
0x0f
;
snprintf
(
ps2port
->
name
,
sizeof
(
ps2port
->
name
)
-
1
,
"%s %s"
,
gscps2_serio_port
.
name
,
gscps2_serio_port
.
name
,
(
ps2port
->
id
==
GSC_ID_KEYBOARD
)
?
"keyboard"
:
"mouse"
);
memcpy
(
&
ps2port
->
port
,
&
gscps2_serio_port
,
sizeof
(
gscps2_serio_port
));
...
...
@@ -401,9 +401,9 @@ static int __init gscps2_probe(struct parisc_device *dev)
ps2port
->
port
.
phys
);
serio_register_port
(
&
ps2port
->
port
);
return
0
;
fail:
free_irq
(
dev
->
irq
,
ps2port
);
...
...
@@ -430,7 +430,7 @@ static int __devexit gscps2_remove(struct parisc_device *dev)
list_del
(
&
ps2port
->
node
);
iounmap
(
ps2port
->
addr
);
#if 0
release_mem_region(dev->hpa, GSC_STATUS + 4);
release_mem_region(dev->hpa, GSC_STATUS + 4);
#endif
dev_set_drvdata
(
&
dev
->
dev
,
NULL
);
kfree
(
ps2port
);
...
...
@@ -441,7 +441,7 @@ static int __devexit gscps2_remove(struct parisc_device *dev)
static
struct
parisc_device_id
gscps2_device_tbl
[]
=
{
{
HPHW_FIO
,
HVERSION_REV_ANY_ID
,
HVERSION_ANY_ID
,
0x00084
},
/* LASI PS/2 */
#ifdef DINO_TESTED
{
HPHW_FIO
,
HVERSION_REV_ANY_ID
,
HVERSION_ANY_ID
,
0x00096
},
/* DINO PS/2 */
{
HPHW_FIO
,
HVERSION_REV_ANY_ID
,
HVERSION_ANY_ID
,
0x00096
},
/* DINO PS/2 */
#endif
{
0
,
}
/* 0 terminated list */
};
...
...
drivers/input/serio/i8042.c
View file @
0370010b
...
...
@@ -150,7 +150,7 @@ static int i8042_flush(void)
*/
static
int
i8042_command
(
unsigned
char
*
param
,
int
command
)
{
{
unsigned
long
flags
;
int
retval
=
0
,
i
=
0
;
...
...
@@ -161,7 +161,7 @@ static int i8042_command(unsigned char *param, int command)
dbg
(
"%02x -> i8042 (command)"
,
command
&
0xff
);
i8042_write_command
(
command
&
0xff
);
}
if
(
!
retval
)
for
(
i
=
0
;
i
<
((
command
>>
12
)
&
0xf
);
i
++
)
{
if
((
retval
=
i8042_wait_write
()))
break
;
...
...
@@ -172,7 +172,7 @@ static int i8042_command(unsigned char *param, int command)
if
(
!
retval
)
for
(
i
=
0
;
i
<
((
command
>>
8
)
&
0xf
);
i
++
)
{
if
((
retval
=
i8042_wait_read
()))
break
;
if
(
i8042_read_status
()
&
I8042_STR_AUXDATA
)
if
(
i8042_read_status
()
&
I8042_STR_AUXDATA
)
param
[
i
]
=
~
i8042_read_data
();
else
param
[
i
]
=
i8042_read_data
();
...
...
@@ -415,17 +415,17 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs)
}
else
dfl
=
0
;
dbg
(
"%02x <- i8042 (interrupt, aux%d, %d%s%s)"
,
data
,
(
str
>>
6
),
irq
,
data
,
(
str
>>
6
),
irq
,
dfl
&
SERIO_PARITY
?
", bad parity"
:
""
,
dfl
&
SERIO_TIMEOUT
?
", timeout"
:
""
);
serio_interrupt
(
i8042_mux_port
+
((
str
>>
6
)
&
3
),
data
,
dfl
,
regs
);
goto
irq_ret
;
}
dbg
(
"%02x <- i8042 (interrupt, %s, %d%s%s)"
,
data
,
(
str
&
I8042_STR_AUXDATA
)
?
"aux"
:
"kbd"
,
irq
,
data
,
(
str
&
I8042_STR_AUXDATA
)
?
"aux"
:
"kbd"
,
irq
,
dfl
&
SERIO_PARITY
?
", bad parity"
:
""
,
dfl
&
SERIO_TIMEOUT
?
", timeout"
:
""
);
...
...
@@ -539,7 +539,7 @@ static int __init i8042_check_mux(struct i8042_values *values)
if
(
i8042_enable_mux_mode
(
values
,
&
mux_version
))
return
-
1
;
/* Workaround for broken chips which seem to support MUX, but in reality don't. */
/* They all report version 10.12 */
if
(
mux_version
==
0xAC
)
...
...
@@ -607,7 +607,7 @@ static int __init i8042_check_aux(struct i8042_values *values)
/*
* Bit assignment test - filters out PS/2 i8042's in AT mode
*/
if
(
i8042_command
(
&
param
,
I8042_CMD_AUX_DISABLE
))
return
-
1
;
if
(
i8042_command
(
&
param
,
I8042_CMD_CTL_RCTR
)
||
(
~
param
&
I8042_CTR_AUXDIS
))
{
...
...
@@ -618,7 +618,7 @@ static int __init i8042_check_aux(struct i8042_values *values)
if
(
i8042_command
(
&
param
,
I8042_CMD_AUX_ENABLE
))
return
-
1
;
if
(
i8042_command
(
&
param
,
I8042_CMD_CTL_RCTR
)
||
(
param
&
I8042_CTR_AUXDIS
))
return
-
1
;
return
-
1
;
/*
* Disable the interface.
...
...
@@ -648,7 +648,7 @@ static int __init i8042_port_register(struct i8042_values *values, struct serio
if
(
i8042_command
(
&
i8042_ctr
,
I8042_CMD_CTL_WCTR
))
{
printk
(
KERN_WARNING
"i8042.c: Can't write CTR while registering.
\n
"
);
values
->
exists
=
0
;
return
-
1
;
return
-
1
;
}
printk
(
KERN_INFO
"serio: i8042 %s port at %#lx,%#lx irq %d
\n
"
,
...
...
@@ -877,7 +877,7 @@ static int i8042_controller_resume(void)
static
int
i8042_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
i8042_controller_cleanup
();
return
NOTIFY_DONE
;
}
...
...
@@ -1009,13 +1009,13 @@ void __exit i8042_exit(void)
del_timer_sync
(
&
i8042_timer
);
i8042_controller_cleanup
();
if
(
i8042_kbd_values
.
exists
)
serio_unregister_port
(
&
i8042_kbd_port
);
if
(
i8042_aux_values
.
exists
)
serio_unregister_port
(
&
i8042_aux_port
);
for
(
i
=
0
;
i
<
4
;
i
++
)
if
(
i8042_mux_values
[
i
].
exists
)
serio_unregister_port
(
i8042_mux_port
+
i
);
...
...
drivers/input/serio/parkbd.c
View file @
0370010b
...
...
@@ -11,18 +11,18 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
* Should you need to contact me, the author, you can do so either by
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
...
...
@@ -104,7 +104,7 @@ static void parkbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
parkbd_writing
=
0
;
parkbd_writelines
(
3
);
return
;
}
}
parkbd_writelines
(((
parkbd_buffer
>>
parkbd_counter
++
)
&
1
)
|
2
);
...
...
@@ -120,7 +120,7 @@ static void parkbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if
((
parkbd_counter
==
parkbd_mode
+
10
)
||
time_after
(
jiffies
,
parkbd_last
+
HZ
/
100
))
{
parkbd_counter
=
0
;
parkbd_buffer
=
0
;
}
}
parkbd_buffer
|=
(
parkbd_readlines
()
>>
1
)
<<
parkbd_counter
++
;
...
...
drivers/input/serio/q40kbd.c
View file @
0370010b
...
...
@@ -4,7 +4,7 @@
* Copyright (c) 2000-2001 Vojtech Pavlik
*
* Based on the work of:
* Richard Zidlicky <Richard.Zidlicky@stud.informatik.uni-erlangen.de>
* Richard Zidlicky <Richard.Zidlicky@stud.informatik.uni-erlangen.de>
*/
/*
...
...
drivers/input/serio/rpckbd.c
View file @
0370010b
...
...
@@ -98,7 +98,7 @@ static int rpckbd_open(struct serio *port)
static
void
rpckbd_close
(
struct
serio
*
port
)
{
free_irq
(
IRQ_KEYBOARDRX
,
port
);
free_irq
(
IRQ_KEYBOARDTX
,
port
);
free_irq
(
IRQ_KEYBOARDTX
,
port
);
}
static
struct
serio
rpckbd_port
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment