aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/speakup/speakup_acntsa.c
diff options
context:
space:
mode:
authorOkash Khawaja <okash.khawaja@gmail.com>2017-05-15 18:45:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-16 14:19:41 +0200
commitbd697e299609b94a19287e14a3f7926bb44ffc26 (patch)
treec14a8e8062b54f81c0d7cd9699b13ffecced400a /drivers/staging/speakup/speakup_acntsa.c
parentstaging: speakup: add tty-based comms functions (diff)
downloadlinux-dev-bd697e299609b94a19287e14a3f7926bb44ffc26.tar.xz
linux-dev-bd697e299609b94a19287e14a3f7926bb44ffc26.zip
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>
Diffstat (limited to 'drivers/staging/speakup/speakup_acntsa.c')
-rw-r--r--drivers/staging/speakup/speakup_acntsa.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/speakup/speakup_acntsa.c b/drivers/staging/speakup/speakup_acntsa.c
index de67ffda7d45..6e4f873eddbc 100644
--- 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);