aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-30 14:53:05 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-30 14:53:05 -0800
commit12c7a35ee6a1c605e740733f2cbd5b5079f09f0f (patch)
treeac455e10582f9818159ba574bc4bd9dddad947e5 /arch
parentsparc: Pass buffer pointer all the way down to prom_{get,put}char(). (diff)
downloadlinux-dev-12c7a35ee6a1c605e740733f2cbd5b5079f09f0f.tar.xz
linux-dev-12c7a35ee6a1c605e740733f2cbd5b5079f09f0f.zip
sparc: Delete prom_*getchar().
Completely unused. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/oplib_32.h5
-rw-r--r--arch/sparc/include/asm/oplib_64.h5
-rw-r--r--arch/sparc/prom/console_32.c41
-rw-r--r--arch/sparc/prom/console_64.c32
4 files changed, 0 insertions, 83 deletions
diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
index 4c2539243e46..40bc9efb1ac4 100644
--- a/arch/sparc/include/asm/oplib_32.h
+++ b/arch/sparc/include/asm/oplib_32.h
@@ -102,11 +102,6 @@ extern int prom_getrev(void);
/* Get the prom firmware revision. */
extern int prom_getprev(void);
-/* Character operations to/from the console.... */
-
-/* Blocking get character from console. */
-extern void prom_getchar(char *buf);
-
/* Blocking put character to console. */
extern void prom_putchar(const char *buf);
diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h
index 384e558a6a3c..d4613738c537 100644
--- a/arch/sparc/include/asm/oplib_64.h
+++ b/arch/sparc/include/asm/oplib_64.h
@@ -94,11 +94,6 @@ extern void prom_halt_power_off(void) __attribute__ ((noreturn));
*/
extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);
-/* Character operations to/from the console.... */
-
-/* Blocking get character from console. */
-extern void prom_getchar(char *buf);
-
/* Blocking put character to console. */
extern void prom_putchar(const char *buf);
diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c
index 69c16bbf1f48..157019e29fd4 100644
--- a/arch/sparc/prom/console_32.c
+++ b/arch/sparc/prom/console_32.c
@@ -16,37 +16,6 @@
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.
- */
-static int prom_nbgetchar(char *buf)
-{
- unsigned long flags;
- int i = -1;
-
- spin_lock_irqsave(&prom_lock, flags);
- switch(prom_vers) {
- case PROM_V0:
- i = (*(romvec->pv_nbgetchar))();
- if (i != -1) {
- *buf = i;
- i = 0;
- }
- break;
- case PROM_V2:
- case PROM_V3:
- if ((*(romvec->pv_v2devops).v2_dev_read)(*romvec->pv_v2bootargs.fd_stdin,
- buf, 0x1) == 1)
- i = 0;
- break;
- default:
- break;
- };
- restore_current();
- spin_unlock_irqrestore(&prom_lock, flags);
- return i; /* Ugh, we could spin forever on unsupported proms ;( */
-}
-
/* Non blocking put character to console device, returns -1 if
* unsuccessful.
*/
@@ -74,16 +43,6 @@ static int prom_nbputchar(const char *buf)
return i; /* Ugh, we could spin forever on unsupported proms ;( */
}
-/* Blocking version of get character routine above. */
-void prom_getchar(char *buf)
-{
- while (1) {
- int err = prom_nbgetchar(buf);
- if (!err)
- break;
- }
-}
-
/* Blocking version of put character routine above. */
void prom_putchar(const char *buf)
{
diff --git a/arch/sparc/prom/console_64.c b/arch/sparc/prom/console_64.c
index a9a575433ce9..0da88d10beff 100644
--- a/arch/sparc/prom/console_64.c
+++ b/arch/sparc/prom/console_64.c
@@ -15,28 +15,6 @@
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.
- */
-static int prom_nbgetchar(char *buf)
-{
- unsigned long args[7];
-
- args[0] = (unsigned long) "read";
- args[1] = 3;
- args[2] = 1;
- args[3] = (unsigned int) prom_stdin;
- args[4] = (unsigned long) buf;
- args[5] = 1;
- args[6] = (unsigned long) -1;
-
- p1275_cmd_direct(args);
-
- if (args[6] == 1)
- return 0;
- return -1;
-}
-
/* Non blocking put character to console device, returns -1 if
* unsuccessful.
*/
@@ -60,16 +38,6 @@ static int prom_nbputchar(const char *buf)
return -1;
}
-/* Blocking version of get character routine above. */
-void prom_getchar(char *buf)
-{
- while (1) {
- int err = prom_nbgetchar(buf);
- if (!err)
- break;
- }
-}
-
/* Blocking version of put character routine above. */
void prom_putchar(const char *buf)
{