[PATCH 3/3] staging: speakup: initialise serial_out() method in drivers

Okash Khawaja okash.khawaja at gmail.com
Sat Nov 19 10:51:14 EST 2016


Initialise serial_out() to spk_serial_out() in all drivers except
speakup_dummy which uses spk_serial_out2() instead.

Signed-off-by: Okash Khawaja <okash.khawaja at gmail.com>
---
 drivers/staging/speakup/speakup_acntpc.c | 1 +
 drivers/staging/speakup/speakup_acntsa.c | 1 +
 drivers/staging/speakup/speakup_apollo.c | 1 +
 drivers/staging/speakup/speakup_audptr.c | 1 +
 drivers/staging/speakup/speakup_bns.c    | 1 +
 drivers/staging/speakup/speakup_decext.c | 1 +
 drivers/staging/speakup/speakup_decpc.c  | 1 +
 drivers/staging/speakup/speakup_dectlk.c | 1 +
 drivers/staging/speakup/speakup_dtlk.c   | 1 +
 drivers/staging/speakup/speakup_dummy.c  | 1 +
 drivers/staging/speakup/speakup_keypc.c  | 1 +
 drivers/staging/speakup/speakup_ltlk.c   | 1 +
 drivers/staging/speakup/speakup_soft.c   | 1 +
 drivers/staging/speakup/speakup_spkout.c | 1 +
 drivers/staging/speakup/speakup_txprt.c  | 1 +
 15 files changed, 15 insertions(+)

diff --git a/drivers/staging/speakup/speakup_acntpc.c b/drivers/staging/speakup/speakup_acntpc.c
index efb791b..22557e4 100644
--- a/drivers/staging/speakup/speakup_acntpc.c
+++ b/drivers/staging/speakup/speakup_acntpc.c
@@ -115,6 +115,7 @@ static struct spk_synth synth_acntpc = {
 	.vars = vars,
 	.probe = synth_probe,
 	.release = accent_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_acntsa.c b/drivers/staging/speakup/speakup_acntsa.c
index 34f45d3..3b18cb9 100644
--- a/drivers/staging/speakup/speakup_acntsa.c
+++ b/drivers/staging/speakup/speakup_acntsa.c
@@ -101,6 +101,7 @@ static struct spk_synth synth_acntsa = {
 	.vars = vars,
 	.probe = synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_apollo.c b/drivers/staging/speakup/speakup_apollo.c
index 3cbc8a7..47db548 100644
--- a/drivers/staging/speakup/speakup_apollo.c
+++ b/drivers/staging/speakup/speakup_apollo.c
@@ -110,6 +110,7 @@ static struct spk_synth synth_apollo = {
 	.vars = vars,
 	.probe = spk_serial_synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_audptr.c b/drivers/staging/speakup/speakup_audptr.c
index 7a12b84..1714b7d 100644
--- a/drivers/staging/speakup/speakup_audptr.c
+++ b/drivers/staging/speakup/speakup_audptr.c
@@ -106,6 +106,7 @@ static struct spk_synth synth_audptr = {
 	.vars = vars,
 	.probe = synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_bns.c b/drivers/staging/speakup/speakup_bns.c
index 570f0c2..e9cbcfc 100644
--- a/drivers/staging/speakup/speakup_bns.c
+++ b/drivers/staging/speakup/speakup_bns.c
@@ -98,6 +98,7 @@ static struct spk_synth synth_bns = {
 	.vars = vars,
 	.probe = spk_serial_synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_decext.c b/drivers/staging/speakup/speakup_decext.c
index 1a5cf3d..098d079 100644
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -129,6 +129,7 @@ static struct spk_synth synth_decext = {
 	.vars = vars,
 	.probe = spk_serial_synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
index d6479bd..7fc956a 100644
--- a/drivers/staging/speakup/speakup_decpc.c
+++ b/drivers/staging/speakup/speakup_decpc.c
@@ -222,6 +222,7 @@ static struct spk_synth synth_dec_pc = {
 	.vars = vars,
 	.probe = synth_probe,
 	.release = dtpc_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_dectlk.c b/drivers/staging/speakup/speakup_dectlk.c
index 7646567..9bdf2ea 100644
--- a/drivers/staging/speakup/speakup_dectlk.c
+++ b/drivers/staging/speakup/speakup_dectlk.c
@@ -132,6 +132,7 @@ static struct spk_synth synth_dectlk = {
 	.default_vol = g5_defaults,
 	.probe = spk_serial_synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c
index 38aa401..47768cd 100644
--- a/drivers/staging/speakup/speakup_dtlk.c
+++ b/drivers/staging/speakup/speakup_dtlk.c
@@ -130,6 +130,7 @@ static struct spk_synth synth_dtlk = {
 	.vars = vars,
 	.probe = synth_probe,
 	.release = dtlk_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_dummy.c b/drivers/staging/speakup/speakup_dummy.c
index 87d2a80..65e938f 100644
--- a/drivers/staging/speakup/speakup_dummy.c
+++ b/drivers/staging/speakup/speakup_dummy.c
@@ -100,6 +100,7 @@ static struct spk_synth synth_dummy = {
 	.vars = vars,
 	.probe = spk_serial_synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out2,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_keypc.c b/drivers/staging/speakup/speakup_keypc.c
index 5e2170b..e7c5c1c 100644
--- a/drivers/staging/speakup/speakup_keypc.c
+++ b/drivers/staging/speakup/speakup_keypc.c
@@ -107,6 +107,7 @@ static struct spk_synth synth_keypc = {
 	.vars = vars,
 	.probe = synth_probe,
 	.release = keynote_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_ltlk.c b/drivers/staging/speakup/speakup_ltlk.c
index b474e8b..82a995c 100644
--- a/drivers/staging/speakup/speakup_ltlk.c
+++ b/drivers/staging/speakup/speakup_ltlk.c
@@ -113,6 +113,7 @@ static struct spk_synth synth_ltlk = {
 	.vars = vars,
 	.probe = synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
index 6b1d0f5..f364ac1 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -133,6 +133,7 @@ static struct spk_synth synth_soft = {
 	.vars = vars,
 	.probe = softsynth_probe,
 	.release = softsynth_release,
+	.serial_out = NULL,
 	.synth_immediate = NULL,
 	.catch_up = NULL,
 	.flush = NULL,
diff --git a/drivers/staging/speakup/speakup_spkout.c b/drivers/staging/speakup/speakup_spkout.c
index e449f27..90384dd 100644
--- a/drivers/staging/speakup/speakup_spkout.c
+++ b/drivers/staging/speakup/speakup_spkout.c
@@ -105,6 +105,7 @@ static struct spk_synth synth_spkout = {
 	.vars = vars,
 	.probe = spk_serial_synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_txprt.c b/drivers/staging/speakup/speakup_txprt.c
index fd98d4f..2c322f7 100644
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -98,6 +98,7 @@ static struct spk_synth synth_txprt = {
 	.vars = vars,
 	.probe = spk_serial_synth_probe,
 	.release = spk_serial_release,
+	.serial_out = spk_serial_out,
 	.synth_immediate = spk_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
--
2.10.2



More information about the Speakup mailing list