diff options
author | Okash Khawaja <okash.khawaja@gmail.com> | 2017-03-16 08:10:17 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-17 15:19:09 +0900 |
commit | 98c1fda752b604c68f2d7c9a0e10c6aaa3bd2a17 (patch) | |
tree | 11e506767710a24def484f98717dfb8be18e55a7 /drivers/staging/speakup/speakup_acntsa.c | |
parent | 5e492ab566f7302d2143d739361cf33076da8e71 (diff) | |
download | op-kernel-dev-98c1fda752b604c68f2d7c9a0e10c6aaa3bd2a17.zip op-kernel-dev-98c1fda752b604c68f2d7c9a0e10c6aaa3bd2a17.tar.gz |
staging: speakup: move those functions which do outgoing serial comms, into serialio.c
This moves spk_synth_immediate and spk_serial_synth_probe functions into
serialio.c. These functions do outgoing serial comms. The move is a step
towards collecting all serial comms in serialio.c. This also renames
spk_synth_immediate to spk_serial_synth_immediate.
Code inside those functions has not been changed. Along the way, this patch
also fixes a couple of spots which were calling spk_synth_immediate directly,
so that the calls now happen via the spk_syth struct.
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/speakup/speakup_acntsa.c b/drivers/staging/speakup/speakup_acntsa.c index 6a66801..de67ffd 100644 --- a/drivers/staging/speakup/speakup_acntsa.c +++ b/drivers/staging/speakup/speakup_acntsa.c @@ -102,7 +102,7 @@ static struct spk_synth synth_acntsa = { .io_ops = &spk_serial_io_ops, .probe = synth_probe, .release = spk_serial_release, - .synth_immediate = spk_synth_immediate, + .synth_immediate = spk_serial_synth_immediate, .catch_up = spk_do_catch_up, .flush = spk_synth_flush, .is_alive = spk_synth_is_alive_restart, @@ -127,7 +127,7 @@ static int synth_probe(struct spk_synth *synth) failed = spk_serial_synth_probe(synth); if (failed == 0) { - spk_synth_immediate(synth, "\033=R\r"); + synth->synth_immediate(synth, "\033=R\r"); mdelay(100); } synth->alive = !failed; |