diff options
author | Okash Khawaja <okash.khawaja@gmail.com> | 2017-05-15 18:45:36 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-16 14:19:41 +0200 |
commit | 470790eefede39ebc22594ce657f14cc83365aed (patch) | |
tree | bc48349569b2c8893339286197f036971277e2f6 /drivers/staging/speakup/speakup_spkout.c | |
parent | staging: speakup: add send_xchar, tiocmset and input functionality for tty (diff) | |
download | linux-dev-470790eefede39ebc22594ce657f14cc83365aed.tar.xz linux-dev-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_spkout.c')
-rw-r--r-- | drivers/staging/speakup/speakup_spkout.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/speakup/speakup_spkout.c b/drivers/staging/speakup/speakup_spkout.c index 5160e4afdbef..fa1a40be9134 100644 --- a/drivers/staging/speakup/speakup_spkout.c +++ b/drivers/staging/speakup/speakup_spkout.c @@ -20,7 +20,6 @@ */ #include "spk_priv.h" #include "speakup.h" -#include "serialio.h" #define DRV_VERSION "2.11" #define SYNTH_CLEAR 0x18 @@ -102,10 +101,10 @@ static struct spk_synth synth_spkout = { .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 = synth_flush, .is_alive = spk_synth_is_alive_restart, |