aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-17 10:22:56 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-07 13:58:24 -0800
commitfdd634924c92ce50311e7125212c6b61738e4a7d (patch)
treecb1d769e2909fae7e2f48e46da534cbd14952562 /arch
parent6a3593f1a31600505729ebcdd6a931350045b143 (diff)
sparc: Do not export prom_nb{get,put}char().
[ Upstream commit 91921fef7c658b12de53376b312d071d757f7770 ] Never used outside of console_{32,64}.c Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-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 66df2b15c88..ca51a666f62 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);
/* Character operations to/from the console.... */
-/* Non-blocking get character from console. */
-extern int prom_nbgetchar(void);
-
-/* Non-blocking put character to console. */
-extern int prom_nbputchar(char character);
-
/* Blocking get character from console. */
extern char prom_getchar(void);
diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h
index 7ab973d0190..0d614e3f087 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);
/* Character operations to/from the console.... */
-/* Non-blocking get character from console. */
-extern int prom_nbgetchar(void);
-
-/* Non-blocking put character to console. */
-extern int prom_nbputchar(char character);
-
/* Blocking get character from console. */
extern char prom_getchar(void);
diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c
index 5340264b78f..2ce5acb45f2 100644
--- a/arch/sparc/prom/console_32.c
+++ b/arch/sparc/prom/console_32.c
@@ -19,8 +19,7 @@ extern void restore_current(void);
/* Non blocking get character from console input device, returns -1
* if no input was taken. This can be used for polling.
*/
-int
-prom_nbgetchar(void)
+static int prom_nbgetchar(void)
{
static char inc;
int i = -1;
@@ -51,8 +50,7 @@ prom_nbgetchar(void)
/* Non blocking put character to console device, returns -1 if
* unsuccessful.
*/
-int
-prom_nbputchar(char c)
+static int prom_nbputchar(char c)
{
static char outc;
unsigned long flags;
diff --git a/arch/sparc/prom/console_64.c b/arch/sparc/prom/console_64.c
index de67fc73d91..33a8b275d6a 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;
/* Non blocking get character from console input device, returns -1
* if no input was taken. This can be used for polling.
*/
-inline int
-prom_nbgetchar(void)
+static int prom_nbgetchar(void)
{
unsigned long args[7];
char inc;
@@ -42,8 +41,7 @@ prom_nbgetchar(void)
/* Non blocking put character to console device, returns -1 if
* unsuccessful.
*/
-inline int
-prom_nbputchar(char c)
+static int prom_nbputchar(char c)
{
unsigned long args[7];
char outc;