diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-12 17:57:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-12 17:57:53 -0500 |
commit | bce5feeab418fb1df9ce1c3fcc14f0aacf740208 (patch) | |
tree | 51037522aa53bc01da516d4506367e9ea6446fbf /arch/sparc | |
parent | 154337688bfa970453836e65a27de011aba55331 (diff) |
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/sparc')
-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[]; | |||
18 | */ | 18 | */ |
19 | extern phandle prom_root_node; | 19 | extern phandle prom_root_node; |
20 | 20 | ||
21 | /* PROM stdin and stdout */ | 21 | /* PROM stdout */ |
22 | extern int prom_stdin, prom_stdout; | 22 | extern int prom_stdout; |
23 | 23 | ||
24 | /* /chosen node of the prom device tree, this stays constant after | 24 | /* /chosen node of the prom device tree, this stays constant after |
25 | * initialization is complete. | 25 | * 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 @@ | |||
13 | #include <asm/system.h> | 13 | #include <asm/system.h> |
14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
15 | 15 | ||
16 | extern int prom_stdin, prom_stdout; | ||
17 | |||
18 | static int __prom_console_write_buf(const char *buf, int len) | 16 | static int __prom_console_write_buf(const char *buf, int len) |
19 | { | 17 | { |
20 | unsigned long args[7]; | 18 | 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 @@ | |||
18 | char prom_version[80]; | 18 | char prom_version[80]; |
19 | 19 | ||
20 | /* The root node of the prom device tree. */ | 20 | /* The root node of the prom device tree. */ |
21 | int prom_stdin, prom_stdout; | 21 | int prom_stdout; |
22 | phandle prom_chosen_node; | 22 | phandle prom_chosen_node; |
23 | 23 | ||
24 | /* You must call prom_init() before you attempt to use any of the | 24 | /* 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) | |||
38 | if (!prom_chosen_node || prom_chosen_node == -1) | 38 | if (!prom_chosen_node || prom_chosen_node == -1) |
39 | prom_halt(); | 39 | prom_halt(); |
40 | 40 | ||
41 | prom_stdin = prom_getint(prom_chosen_node, "stdin"); | ||
42 | prom_stdout = prom_getint(prom_chosen_node, "stdout"); | 41 | prom_stdout = prom_getint(prom_chosen_node, "stdout"); |
43 | 42 | ||
44 | node = prom_finddevice("/openprom"); | 43 | node = prom_finddevice("/openprom"); |