Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / speakup / synth.c

diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 7616f058a00b43ab4c1dd91d0384e6a5400b9a65..d867dd9109ed614fb2f0c183796aed84a8f0b2e2 100644 (file)
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -20,9 +20,9 @@
 #define MAXSYNTHS       16      /* Max number of synths in array. */
 static struct spk_synth *synths[MAXSYNTHS];
 struct spk_synth *synth;
-char pitch_buff[32] = "";
+char spk_pitch_buff[32] = "";
 static int module_status;
-bool quiet_boot;
+bool spk_quiet_boot;
 
 struct speakup_info_t speakup_info = {
        .spinlock = __SPIN_LOCK_UNLOCKED(speakup_info.spinlock),
@@ -32,7 +32,7 @@ EXPORT_SYMBOL_GPL(speakup_info);
 
 static int do_synth_init(struct spk_synth *in_synth);
 
-int serial_synth_probe(struct spk_synth *synth)
+int spk_serial_synth_probe(struct spk_synth *synth)
 {
        const struct old_serial_port *ser;
        int failed = 0;
@@ -59,7 +59,7 @@ int serial_synth_probe(struct spk_synth *synth)
        synth->alive = 1;
        return 0;
 }
-EXPORT_SYMBOL_GPL(serial_synth_probe);
+EXPORT_SYMBOL_GPL(spk_serial_synth_probe);
 
 /* Main loop of the progression thread: keep eating from the buffer
  * and push to the serial port, waiting as needed
@@ -79,9 +79,9 @@ void spk_do_catch_up(struct spk_synth *synth)
        int delay_time_val;
        int full_time_val;
 
-       jiffy_delta = get_var(JIFFY);
-       full_time = get_var(FULL);
-       delay_time = get_var(DELAY);
+       jiffy_delta = spk_get_var(JIFFY);
+       full_time = spk_get_var(FULL);
+       delay_time = spk_get_var(DELAY);
 
        spk_lock(flags);
        jiffy_delta_val = jiffy_delta->u.n.value;
@@ -139,7 +139,7 @@ const char *spk_synth_immediate(struct spk_synth *synth, const char *buff)
        while ((ch = *buff)) {
                if (ch == '\n')
                        ch = synth->procspeech;
-               if (wait_for_xmitr())
+               if (spk_wait_for_xmitr())
                        outb(ch, speakup_info.port_tts);
                else
                        return buff;
@@ -166,7 +166,7 @@ int spk_synth_is_alive_restart(struct spk_synth *synth)
 {
        if (synth->alive)
                return 1;
-       if (!synth->alive && wait_for_xmitr() > 0) {
+       if (!synth->alive && spk_wait_for_xmitr() > 0) {
                /* restart */
                synth->alive = 1;
                synth_printf("%s", synth->init);
@@ -192,20 +192,20 @@ void synth_start(void)
                synth_buffer_clear();
                return;
        }
-       trigger_time = get_var(TRIGGER);
+       trigger_time = spk_get_var(TRIGGER);
        if (!timer_pending(&thread_timer))
                mod_timer(&thread_timer, jiffies +
                        msecs_to_jiffies(trigger_time->u.n.value));
 }
 
-void do_flush(void)
+void spk_do_flush(void)
 {
        speakup_info.flushing = 1;
        synth_buffer_clear();
        if (synth->alive) {
-               if (pitch_shift) {
-                       synth_printf("%s", pitch_buff);
-                       pitch_shift = 0;
+               if (spk_pitch_shift) {
+                       synth_printf("%s", spk_pitch_buff);
+                       spk_pitch_shift = 0;
                }
        }
        wake_up_interruptible_all(&speakup_event);
@@ -241,7 +241,7 @@ EXPORT_SYMBOL_GPL(synth_printf);
 static int index_count;
 static int sentence_count;
 
-void reset_index_count(int sc)
+void spk_reset_index_count(int sc)
 {
        static int first = 1;
        if (first)
@@ -277,7 +277,7 @@ void synth_insert_next_index(int sent_num)
        }
 }
 
-void get_index_count(int *linecount, int *sentcount)
+void spk_get_index_count(int *linecount, int *sentcount)
 {
        int ind = synth->get_index();
        if (ind) {
@@ -384,7 +384,7 @@ static int do_synth_init(struct spk_synth *in_synth)
        for (var = synth->vars;
                (var->var_id >= 0) && (var->var_id < MAXVARS); var++)
                speakup_register_var(var);
-       if (!quiet_boot)
+       if (!spk_quiet_boot)
                synth_printf("%s found\n", synth->long_name);
        if (synth->attributes.name
        && sysfs_create_group(speakup_kobj, &(synth->attributes)) < 0)
@@ -412,7 +412,7 @@ void synth_release(void)
                sysfs_remove_group(speakup_kobj, &(synth->attributes));
        for (var = synth->vars; var->var_id != MAXVARS; var++)
                speakup_unregister_var(var->var_id);
-       stop_serial_interrupt();
+       spk_stop_serial_interrupt();
        synth->release();
        synth = NULL;
 }
@@ -460,4 +460,4 @@ void synth_remove(struct spk_synth *in_synth)
 }
 EXPORT_SYMBOL_GPL(synth_remove);
 
-short punc_masks[] = { 0, SOME, MOST, PUNC, PUNC|B_SYM };
+short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC|B_SYM };