staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio

This changes the above five synths to TTY-based comms. They were chosen as a
first pass because their serial comms are straightforward, i.e. they don't use
serial input and don't do internal port knocking.

Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/speakup/speakup_acntsa.c b/drivers/staging/speakup/speakup_acntsa.c
index de67ffda7d4563bcea1e54d61561c5d5c78726ae..6e4f873eddbc8e2d2dd7e12a8c3d75bb3ba1f70b 100644 (file)
--- a/drivers/staging/speakup/speakup_acntsa.c
+++ b/drivers/staging/speakup/speakup_acntsa.c
@@ -99,10 +99,10 @@ static struct spk_synth synth_acntsa = {
        .startup = SYNTH_START,
        .checkval = SYNTH_CHECK,
        .vars = vars,
-       .io_ops = &spk_serial_io_ops,
+       .io_ops = &spk_ttyio_ops,
        .probe = synth_probe,
-       .release = spk_serial_release,
-       .synth_immediate = spk_serial_synth_immediate,
+       .release = spk_ttyio_release,
+       .synth_immediate = spk_ttyio_synth_immediate,
        .catch_up = spk_do_catch_up,
        .flush = spk_synth_flush,
        .is_alive = spk_synth_is_alive_restart,
@@ -125,7 +125,7 @@ static int synth_probe(struct spk_synth *synth)
 {
        int failed;
 
-       failed = spk_serial_synth_probe(synth);
+       failed = spk_ttyio_synth_probe(synth);
        if (failed == 0) {
                synth->synth_immediate(synth, "\033=R\r");
                mdelay(100);

diff --git a/drivers/staging/speakup/speakup_dummy.c b/drivers/staging/speakup/speakup_dummy.c
index 8db7aa358f31c556a758e7f0fb1465131bcc15c9..3fdc768c84542cdd8d418ed5f5dd2090026d64f7 100644 (file)
--- a/drivers/staging/speakup/speakup_dummy.c
+++ b/drivers/staging/speakup/speakup_dummy.c
@@ -98,10 +98,10 @@ static struct spk_synth synth_dummy = {
        .startup = SYNTH_START,
        .checkval = SYNTH_CHECK,
        .vars = vars,
-       .io_ops = &spk_serial_io_ops,
-       .probe = spk_serial_synth_probe,
-       .release = spk_serial_release,
-       .synth_immediate = spk_serial_synth_immediate,
+       .io_ops = &spk_ttyio_ops,
+       .probe = spk_ttyio_synth_probe,
+       .release = spk_ttyio_release,
+       .synth_immediate = spk_ttyio_synth_immediate,
        .catch_up = spk_do_catch_up,
        .flush = spk_synth_flush,
        .is_alive = spk_synth_is_alive_restart,

diff --git a/drivers/staging/speakup/speakup_txprt.c b/drivers/staging/speakup/speakup_txprt.c
index 3f531fb99fd360fe3702ac32e2a1e982cce1b3e2..e4c1b5424f94d4a580b41fdc107633e9a34ae0f9 100644 (file)
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -95,10 +95,10 @@ static struct spk_synth synth_txprt = {
        .startup = SYNTH_START,
        .checkval = SYNTH_CHECK,
        .vars = vars,
-       .io_ops = &spk_serial_io_ops,
-       .probe = spk_serial_synth_probe,
-       .release = spk_serial_release,
-       .synth_immediate = spk_serial_synth_immediate,
+       .io_ops = &spk_ttyio_ops,
+       .probe = spk_ttyio_synth_probe,
+       .release = spk_ttyio_release,
+       .synth_immediate = spk_ttyio_synth_immediate,
        .catch_up = spk_do_catch_up,
        .flush = spk_synth_flush,
        .is_alive = spk_synth_is_alive_restart,