diff options
| author | Okash Khawaja | 2017-03-16 09:10:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-03-17 07:19:09 +0100 |
| commit | 98c1fda752b604c68f2d7c9a0e10c6aaa3bd2a17 (patch) | |
| tree | 11e506767710a24def484f98717dfb8be18e55a7 /drivers/staging/speakup/speakup_ltlk.c | |
| parent | Staging: goldfish: use __func__ instead of embedded function names (diff) | |
| download | kernel-qcow2-linux-98c1fda752b604c68f2d7c9a0e10c6aaa3bd2a17.tar.gz kernel-qcow2-linux-98c1fda752b604c68f2d7c9a0e10c6aaa3bd2a17.tar.xz kernel-qcow2-linux-98c1fda752b604c68f2d7c9a0e10c6aaa3bd2a17.zip | |
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_ltlk.c')
| -rw-r--r-- | drivers/staging/speakup/speakup_ltlk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/speakup/speakup_ltlk.c b/drivers/staging/speakup/speakup_ltlk.c index ca4c0484a806..cb4f2958c318 100644 --- a/drivers/staging/speakup/speakup_ltlk.c +++ b/drivers/staging/speakup/speakup_ltlk.c @@ -114,7 +114,7 @@ static struct spk_synth synth_ltlk = { .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, @@ -139,7 +139,7 @@ static void synth_interrogate(struct spk_synth *synth) unsigned char *t, i; unsigned char buf[50], rom_v[20]; - spk_synth_immediate(synth, "\x18\x01?"); + synth->synth_immediate(synth, "\x18\x01?"); for (i = 0; i < 50; i++) { buf[i] = spk_serial_in(); if (i > 2 && buf[i] == 0x7f) |