From 3e4943802406a57f848a35141cfff252650c0a1c Mon Sep 17 00:00:00 2001
From: Christopher Brannon <cmbrannon79@gmail.com>
Date: Thu, 14 Oct 2010 19:23:46 -0500
Subject: [PATCH] --- yaml --- r: 220339 b: refs/heads/master c:
 bf4a4bacb051c278cca819600ecb4ab3f0902f17 h: refs/heads/master i:   220337:
 596718a065d0d5f00a1d4e27828e561ac5d063e7   220335:
 efcc4406efc4b04d902565ba20c22f7d0f101773 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/speakup/speakup_acntpc.c  | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index bdf00f42ef82..ba59a696eb3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73f12e8d3d94828b9efe2b8b8a34b4ad6d14ee47
+refs/heads/master: bf4a4bacb051c278cca819600ecb4ab3f0902f17
diff --git a/trunk/drivers/staging/speakup/speakup_acntpc.c b/trunk/drivers/staging/speakup/speakup_acntpc.c
index d2660e213bee..bbe28b6809e0 100644
--- a/trunk/drivers/staging/speakup/speakup_acntpc.c
+++ b/trunk/drivers/staging/speakup/speakup_acntpc.c
@@ -35,9 +35,6 @@
 #include "speakup_acnt.h" /* local header file for Accent values */
 
 #define DRV_VERSION "2.10"
-#define synth_readable() (inb_p(synth_port_control) & SYNTH_READABLE)
-#define synth_writable() (inb_p(synth_port_control) & SYNTH_WRITABLE)
-#define synth_full() (inb_p(speakup_info.port_tts + UART_RX) == 'F')
 #define PROCSPEECH '\r'
 
 static int synth_probe(struct spk_synth *synth);
@@ -51,13 +48,13 @@ static int port_forced;
 static unsigned int synth_portlist[] = { 0x2a8, 0 };
 
 static struct var_t vars[] = {
-	{ CAPS_START, .u.s = {"\033P8" }},
-	{ CAPS_STOP, .u.s = {"\033P5" }},
-	{ RATE, .u.n = {"\033R%c", 9, 0, 17, 0, 0, "0123456789abcdefgh" }},
-	{ PITCH, .u.n = {"\033P%d", 5, 0, 9, 0, 0, NULL }},
-	{ VOL, .u.n = {"\033A%d", 5, 0, 9, 0, 0, NULL }},
-	{ TONE, .u.n = {"\033V%d", 5, 0, 9, 0, 0, NULL }},
-	{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL }},
+	{ CAPS_START, .u.s = {"\033P8" } },
+	{ CAPS_STOP, .u.s = {"\033P5" } },
+	{ RATE, .u.n = {"\033R%c", 9, 0, 17, 0, 0, "0123456789abcdefgh" } },
+	{ PITCH, .u.n = {"\033P%d", 5, 0, 9, 0, 0, NULL } },
+	{ VOL, .u.n = {"\033A%d", 5, 0, 9, 0, 0, NULL } },
+	{ TONE, .u.n = {"\033V%d", 5, 0, 9, 0, 0, NULL } },
+	{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
 	V_LAST_VAR
 };
 
@@ -142,6 +139,16 @@ static struct spk_synth synth_acntpc = {
 	},
 };
 
+static inline bool synth_writable(void)
+{
+	return inb_p(synth_port_control) & SYNTH_WRITABLE;
+}
+
+static inline bool synth_full(void)
+{
+	return inb_p(speakup_info.port_tts + UART_RX) == 'F';
+}
+
 static const char *synth_immediate(struct spk_synth *synth, const char *buf)
 {
 	u_char ch;
@@ -266,8 +273,9 @@ static int synth_probe(struct spk_synth *synth)
 		for (i = 0; synth_portlist[i]; i++) {
 			if (synth_request_region(synth_portlist[i],
 						SYNTH_IO_EXTENT)) {
-				pr_warn("request_region: failed with 0x%x, %d\n",
-					synth_portlist[i], SYNTH_IO_EXTENT);
+				pr_warn
+				    ("request_region: failed with 0x%x, %d\n",
+				     synth_portlist[i], SYNTH_IO_EXTENT);
 				continue;
 			}
 			port_val = inw(synth_portlist[i]) & 0xfffc;