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>

diff --git a/drivers/staging/speakup/speakup_apollo.c b/drivers/staging/speakup/speakup_apollo.c
index cead8b1..7d99fba 100644 (file)
--- a/drivers/staging/speakup/speakup_apollo.c
+++ b/drivers/staging/speakup/speakup_apollo.c
@@ -22,9 +22,9 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/kthread.h>
+#include <linux/serial_reg.h>  /* for UART_MCR* constants */
 
 #include "spk_priv.h"
-#include "serialio.h"
 #include "speakup.h"
 
 #define DRV_VERSION "2.21"
@@ -108,10 +108,10 @@ static struct spk_synth synth_apollo = {
        .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 = do_catch_up,
        .flush = spk_synth_flush,
        .is_alive = spk_synth_is_alive_restart,

diff --git a/drivers/staging/speakup/speakup_audptr.c b/drivers/staging/speakup/speakup_audptr.c
index 800677b..aa6c592 100644 (file)
--- a/drivers/staging/speakup/speakup_audptr.c
+++ b/drivers/staging/speakup/speakup_audptr.c
@@ -20,7 +20,6 @@
  */
 #include "spk_priv.h"
 #include "speakup.h"
-#include "serialio.h"
 
 #define DRV_VERSION "2.11"
 #define SYNTH_CLEAR 0x18 /* flush synth buffer */
@@ -104,10 +103,10 @@ static struct spk_synth synth_audptr = {
        .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 = synth_flush,
        .is_alive = spk_synth_is_alive_restart,
@@ -154,7 +153,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_version(synth);
        synth->alive = !failed;

diff --git a/drivers/staging/speakup/speakup_decext.c b/drivers/staging/speakup/speakup_decext.c
index da73b76..b70bba8 100644 (file)
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -24,12 +24,12 @@
 #include <linux/kthread.h>
 
 #include "spk_priv.h"
-#include "serialio.h"
 #include "speakup.h"
 
 #define DRV_VERSION "2.14"
 #define SYNTH_CLEAR 0x03
 #define PROCSPEECH 0x0b
+
 static volatile unsigned char last_char;
 
 static void read_buff_add(u_char ch)
@@ -123,10 +123,10 @@ static struct spk_synth synth_decext = {
        .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 = do_catch_up,
        .flush = synth_flush,
        .is_alive = spk_synth_is_alive_restart,

diff --git a/drivers/staging/speakup/speakup_dectlk.c b/drivers/staging/speakup/speakup_dectlk.c
index 74acd52..ec968dd 100644 (file)
--- a/drivers/staging/speakup/speakup_dectlk.c
+++ b/drivers/staging/speakup/speakup_dectlk.c
@@ -27,7 +27,6 @@
 #include <linux/kthread.h>
 #include "speakup.h"
 #include "spk_priv.h"
-#include "serialio.h"
 
 #define DRV_VERSION "2.20"
 #define SYNTH_CLEAR 0x03
@@ -130,10 +129,10 @@ static struct spk_synth synth_dectlk = {
        .vars = vars,
        .default_pitch = ap_defaults,
        .default_vol = g5_defaults,
-       .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 = do_catch_up,
        .flush = synth_flush,
        .is_alive = spk_synth_is_alive_restart,

diff --git a/drivers/staging/speakup/speakup_ltlk.c b/drivers/staging/speakup/speakup_ltlk.c
index bd4ac63..9606224 100644 (file)
--- 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;

diff --git a/drivers/staging/speakup/speakup_spkout.c b/drivers/staging/speakup/speakup_spkout.c
index 5160e4a..fa1a40b 100644 (file)
--- 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,