diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-12 23:57:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-12 23:57:53 +0100 |
| commit | bce5feeab418fb1df9ce1c3fcc14f0aacf740208 (patch) | |
| tree | 51037522aa53bc01da516d4506367e9ea6446fbf /arch | |
| parent | sparc: prom: Sanitize return value from prom_nbputchar() (diff) | |
| download | linux-bce5feeab418fb1df9ce1c3fcc14f0aacf740208.tar.xz linux-bce5feeab418fb1df9ce1c3fcc14f0aacf740208.zip | |
sparc: Eliminate prom_stdin.
Completely unused.
Based upon a patch by Julian Calaby.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/oplib_64.h | 4 | ||||
| -rw-r--r-- | arch/sparc/prom/console_64.c | 2 | ||||
| -rw-r--r-- | arch/sparc/prom/init_64.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h index 8cd0df34e82b..97a90475c314 100644 --- a/arch/sparc/include/asm/oplib_64.h +++ b/arch/sparc/include/asm/oplib_64.h @@ -18,8 +18,8 @@ extern char prom_version[]; */ extern phandle prom_root_node; -/* PROM stdin and stdout */ -extern int prom_stdin, prom_stdout; +/* PROM stdout */ +extern int prom_stdout; /* /chosen node of the prom device tree, this stays constant after * initialization is complete. diff --git a/arch/sparc/prom/console_64.c b/arch/sparc/prom/console_64.c index ed39e75828bd..9de6c8cfe04a 100644 --- a/arch/sparc/prom/console_64.c +++ b/arch/sparc/prom/console_64.c @@ -13,8 +13,6 @@ #include <asm/system.h> #include <linux/string.h> -extern int prom_stdin, prom_stdout; - static int __prom_console_write_buf(const char *buf, int len) { unsigned long args[7]; diff --git a/arch/sparc/prom/init_64.c b/arch/sparc/prom/init_64.c index 3ff911e7d25b..9c6ac4b81ded 100644 --- a/arch/sparc/prom/init_64.c +++ b/arch/sparc/prom/init_64.c @@ -18,7 +18,7 @@ char prom_version[80]; /* The root node of the prom device tree. */ -int prom_stdin, prom_stdout; +int prom_stdout; phandle prom_chosen_node; /* You must call prom_init() before you attempt to use any of the @@ -38,7 +38,6 @@ void __init prom_init(void *cif_handler, void *cif_stack) if (!prom_chosen_node || prom_chosen_node == -1) prom_halt(); - prom_stdin = prom_getint(prom_chosen_node, "stdin"); prom_stdout = prom_getint(prom_chosen_node, "stdout"); node = prom_finddevice("/openprom"); |