aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-17 13:22:56 -0500
committerDavid S. Miller <davem@davemloft.net>2010-11-17 13:22:56 -0500
commit91921fef7c658b12de53376b312d071d757f7770 (patch)
treec899703c680f4502b58cf7059f20396d70a8ca3d
parentc540ee70e49b573535c7ddfd0e9a0fc9d549c8b7 (diff)
sparc: Do not export prom_nb{get,put}char().
Never used outside of console_{32,64}.c Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/include/asm/oplib_32.h6
-rw-r--r--arch/sparc/include/asm/oplib_64.h6
-rw-r--r--arch/sparc/prom/console_32.c6
-rw-r--r--arch/sparc/prom/console_64.c6
4 files changed, 4 insertions, 20 deletions
diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
index 1d893fa6374c..49fe4266f86a 100644
--- a/arch/sparc/include/asm/oplib_32.h
+++ b/arch/sparc/include/asm/oplib_32.h
@@ -104,12 +104,6 @@ extern int prom_getprev(void);
104 104
105/* Character operations to/from the console.... */ 105/* Character operations to/from the console.... */
106 106
107/* Non-blocking get character from console. */
108extern int prom_nbgetchar(void);
109
110/* Non-blocking put character to console. */
111extern int prom_nbputchar(char character);
112
113/* Blocking get character from console. */ 107/* Blocking get character from console. */
114extern char prom_getchar(void); 108extern char prom_getchar(void);
115 109
diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h
index 56985e300471..d541de4b6844 100644
--- a/arch/sparc/include/asm/oplib_64.h
+++ b/arch/sparc/include/asm/oplib_64.h
@@ -96,12 +96,6 @@ extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);
96 96
97/* Character operations to/from the console.... */ 97/* Character operations to/from the console.... */
98 98
99/* Non-blocking get character from console. */
100extern int prom_nbgetchar(void);
101
102/* Non-blocking put character to console. */
103extern int prom_nbputchar(char character);
104
105/* Blocking get character from console. */ 99/* Blocking get character from console. */
106extern char prom_getchar(void); 100extern char prom_getchar(void);
107 101
diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c
index 5340264b78f5..2ce5acb45f2d 100644
--- a/arch/sparc/prom/console_32.c
+++ b/arch/sparc/prom/console_32.c
@@ -19,8 +19,7 @@ extern void restore_current(void);
19/* Non blocking get character from console input device, returns -1 19/* Non blocking get character from console input device, returns -1
20 * if no input was taken. This can be used for polling. 20 * if no input was taken. This can be used for polling.
21 */ 21 */
22int 22static int prom_nbgetchar(void)
23prom_nbgetchar(void)
24{ 23{
25 static char inc; 24 static char inc;
26 int i = -1; 25 int i = -1;
@@ -51,8 +50,7 @@ prom_nbgetchar(void)
51/* Non blocking put character to console device, returns -1 if 50/* Non blocking put character to console device, returns -1 if
52 * unsuccessful. 51 * unsuccessful.
53 */ 52 */
54int 53static int prom_nbputchar(char c)
55prom_nbputchar(char c)
56{ 54{
57 static char outc; 55 static char outc;
58 unsigned long flags; 56 unsigned long flags;
diff --git a/arch/sparc/prom/console_64.c b/arch/sparc/prom/console_64.c
index de67fc73d91e..33a8b275d6af 100644
--- a/arch/sparc/prom/console_64.c
+++ b/arch/sparc/prom/console_64.c
@@ -18,8 +18,7 @@ extern int prom_stdin, prom_stdout;
18/* Non blocking get character from console input device, returns -1 18/* Non blocking get character from console input device, returns -1
19 * if no input was taken. This can be used for polling. 19 * if no input was taken. This can be used for polling.
20 */ 20 */
21inline int 21static int prom_nbgetchar(void)
22prom_nbgetchar(void)
23{ 22{
24 unsigned long args[7]; 23 unsigned long args[7];
25 char inc; 24 char inc;
@@ -42,8 +41,7 @@ prom_nbgetchar(void)
42/* Non blocking put character to console device, returns -1 if 41/* Non blocking put character to console device, returns -1 if
43 * unsuccessful. 42 * unsuccessful.
44 */ 43 */
45inline int 44static int prom_nbputchar(char c)
46prom_nbputchar(char c)
47{ 45{
48 unsigned long args[7]; 46 unsigned long args[7];
49 char outc; 47 char outc;