Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / staging / speakup / serialio.c

diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c
index f64eb364533bba8580b60321fb7c9df7e99ba896..7f3d87bf592739821ca05e72b9beb4c52c254605 100644 (file)
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -37,11 +37,12 @@ struct serial_state *spk_serial_init(int index)
                cval |= UART_LCR_EPAR;
        if (synth_request_region(ser->port, 8)) {
                /* try to take it back. */
-               printk("Ports not available, trying to steal them\n");
+               printk(KERN_INFO "Ports not available, trying to steal them\n");
                __release_region(&ioport_resource, ser->port, 8);
                err = synth_request_region(ser->port, 8);
                if (err) {
-                       pr_warn("Unable to allocate port at %x, 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;
                }