These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / speakup / main.c

diff --git a/kernel/drivers/staging/speakup/main.c b/kernel/drivers/staging/speakup/main.c
index c955976..63c59bc 100644 (file)
--- a/kernel/drivers/staging/speakup/main.c
+++ b/kernel/drivers/staging/speakup/main.c
@@ -128,7 +128,8 @@ static char *phonetic[] = {
 
 /* array of 256 char pointers (one for each character description)
  * initialized to default_chars and user selectable via
- * /proc/speakup/characters */
+ * /proc/speakup/characters
+ */
 char *spk_characters[256];
 
 char *spk_default_chars[256] = {
@@ -194,7 +195,8 @@ char *spk_default_chars[256] = {
 
 /* array of 256 u_short (one for each character)
  * initialized to default_chartab and user selectable via
- * /sys/module/speakup/parameters/chartab */
+ * /sys/module/speakup/parameters/chartab
+ */
 u_short spk_chartab[256];
 
 static u_short default_chartab[256] = {
@@ -540,7 +542,8 @@ static void say_next_char(struct vc_data *vc)
  * see if there is a word starting on the next position to the right
  * and return that word if it exists.  If it does not exist it will
  * move left to the beginning of any previous word on the line or the
- * beginning off the line whichever comes first.. */
+ * beginning off the line whichever comes first..
+ */
 
 static u_long get_word(struct vc_data *vc)
 {
@@ -1113,7 +1116,8 @@ static void spkup_write(const char *in_buf, int count)
                         * suppress multiple to get rid of long pauses and
                         * clear repeat count
                         * so if someone has
-                        * repeats on you don't get nothing repeated count */
+                        * repeats on you don't get nothing repeated count
+                        */
                        if (ch != old_ch)
                                synth_printf("%c", ch);
                        else
@@ -1509,7 +1513,8 @@ static void do_handle_cursor(struct vc_data *vc, u_char value, char up_flag)
        if (spk_no_intr)
                spk_do_flush();
 /* the key press flushes if !no_inter but we want to flush on cursor
- * moves regardless of no_inter state */
+ * moves regardless of no_inter state
+ */
        is_cursor = value + 1;
        old_cursor_pos = vc->vc_pos;
        old_cursor_x = vc->vc_x;
@@ -1597,7 +1602,7 @@ static int count_highlight_color(struct vc_data *vc)
 static int get_highlight_color(struct vc_data *vc)
 {
        int i, j;
-       unsigned int cptr[8], tmp;
+       unsigned int cptr[8];
        int vc_num = vc->vc_num;
 
        for (i = 0; i < 8; i++)
@@ -1606,11 +1611,8 @@ static int get_highlight_color(struct vc_data *vc)
        for (i = 0; i < 7; i++)
                for (j = i + 1; j < 8; j++)
                        if (speakup_console[vc_num]->ht.bgcount[cptr[i]] >
-                           speakup_console[vc_num]->ht.bgcount[cptr[j]]) {
-                               tmp = cptr[i];
-                               cptr[i] = cptr[j];
-                               cptr[j] = tmp;
-                       }
+                           speakup_console[vc_num]->ht.bgcount[cptr[j]])
+                               swap(cptr[i], cptr[j]);
 
        for (i = 0; i < 8; i++)
                if (speakup_console[vc_num]->ht.bgcount[cptr[i]] != 0)