diff options
| author | Okash Khawaja | 2017-05-15 19:45:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-05-16 14:19:41 +0200 |
| commit | 470790eefede39ebc22594ce657f14cc83365aed (patch) | |
| tree | bc48349569b2c8893339286197f036971277e2f6 /drivers/staging/speakup/speakup_ltlk.c | |
| parent | staging: speakup: add send_xchar, tiocmset and input functionality for tty (diff) | |
| download | kernel-qcow2-linux-470790eefede39ebc22594ce657f14cc83365aed.tar.gz kernel-qcow2-linux-470790eefede39ebc22594ce657f14cc83365aed.tar.xz kernel-qcow2-linux-470790eefede39ebc22594ce657f14cc83365aed.zip | |
staging: speakup: migrate apollo, ltlk, audptr, decext, dectlk and spkout
This patch simply uses the changes introduced in previous patches and migrates
apollo, ltlk, audptr, decext, spkout and dectlk. Migrations are straightforward
function pointer updates.
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_ltlk.c')
| -rw-r--r-- | drivers/staging/speakup/speakup_ltlk.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/speakup/speakup_ltlk.c b/drivers/staging/speakup/speakup_ltlk.c index bd4ac63730b7..9606224bc4d6 100644 --- a/drivers/staging/speakup/speakup_ltlk.c +++ b/drivers/staging/speakup/speakup_ltlk.c @@ -20,7 +20,6 @@ */ #include "speakup.h" #include "spk_priv.h" -#include "serialio.h" #include "speakup_dtlk.h" /* local header file for LiteTalk values */ #define DRV_VERSION "2.11" @@ -111,10 +110,10 @@ static struct spk_synth synth_ltlk = { .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, @@ -159,7 +158,7 @@ static int synth_probe(struct spk_synth *synth) { int failed = 0; - failed = spk_serial_synth_probe(synth); + failed = spk_ttyio_synth_probe(synth); if (failed == 0) synth_interrogate(synth); synth->alive = !failed; |