summaryrefslogtreecommitdiff
path: root/drivers/staging/speakup
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2010-10-15 22:13:36 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-19 10:06:05 -0700
commitbaf9ac9ff8864ce9379b1fd2429103ce8c4d7430 (patch)
treeaa6e29e8b0c35d7df82c6de81ea9ad64c10477b5 /drivers/staging/speakup
parenta1768fbbd96ae1028cc3ffb56aebfa025087a677 (diff)
staging: speakup: serialio.c style fixes
fix issues reported by checkpatch.pl Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/speakup')
-rw-r--r--drivers/staging/speakup/serialio.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c
index 65772ec3822d..7f3d87bf5927 100644
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -41,7 +41,8 @@ struct serial_state *spk_serial_init(int index)
__release_region(&ioport_resource, ser->port, 8);
err = synth_request_region(ser->port, 8);
if (err) {
- pr_warn("Unable to allocate port at %lx, errno %i", ser->port, err);
+ pr_warn("Unable to allocate port at %lx, errno %i",
+ ser->port, err);
return NULL;
}
}
@@ -134,7 +135,8 @@ int wait_for_xmitr(void)
{
int tmout = SPK_XMITR_TIMEOUT;
if ((synth->alive) && (timeouts >= NUM_DISABLE_TIMEOUTS)) {
- pr_warn("%s: too many timeouts, deactivating speakup\n", synth->long_name);
+ pr_warn("%s: too many timeouts, deactivating speakup\n",
+ synth->long_name);
synth->alive = 0;
/* No synth any more, so nobody will restart TTYs, and we thus
* need to do it ourselves. Now that there is no synth we can
@@ -155,7 +157,8 @@ int wait_for_xmitr(void)
while (!((inb_p(speakup_info.port_tts + UART_MSR)) & UART_MSR_CTS)) {
/* CTS */
if (--tmout == 0) {
- /* pr_warn("%s: timed out (cts)\n", synth->long_name); */
+ /* pr_warn("%s: timed out (cts)\n",
+ * synth->long_name); */
timeouts++;
return 0;
}