diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2012-10-09 00:20:28 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 20:59:33 -0500 |
commit | 6432200aa8de3242d64c02e0bf29305147df0171 (patch) | |
tree | e8a76bd1dea22e32b3d101d1a26e32127fdbf4d3 | |
parent | f7fb862b843269d02a2fa75e4bbb49603f801b88 (diff) |
powerpc/udbg: Remove unused udbg_read()
The last user of udbg_read() was removed in 2005, in commit fca5dcd
"Simplify and clean up the xmon terminal I/O".
Given we haven't needed it for 7 years we can probably drop it.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/include/asm/udbg.h | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/udbg.c | 23 |
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/include/asm/udbg.h b/arch/powerpc/include/asm/udbg.h index b3038817b8d..5a7510e9d09 100644 --- a/arch/powerpc/include/asm/udbg.h +++ b/arch/powerpc/include/asm/udbg.h | |||
@@ -21,7 +21,6 @@ extern int (*udbg_getc_poll)(void); | |||
21 | 21 | ||
22 | extern void udbg_puts(const char *s); | 22 | extern void udbg_puts(const char *s); |
23 | extern int udbg_write(const char *s, int n); | 23 | extern int udbg_write(const char *s, int n); |
24 | extern int udbg_read(char *buf, int buflen); | ||
25 | 24 | ||
26 | extern void register_early_udbg_console(void); | 25 | extern void register_early_udbg_console(void); |
27 | extern void udbg_printf(const char *fmt, ...) | 26 | extern void udbg_printf(const char *fmt, ...) |
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c index c39c1ca77f4..f9748498fe5 100644 --- a/arch/powerpc/kernel/udbg.c +++ b/arch/powerpc/kernel/udbg.c | |||
@@ -122,29 +122,6 @@ int udbg_write(const char *s, int n) | |||
122 | return n - remain; | 122 | return n - remain; |
123 | } | 123 | } |
124 | 124 | ||
125 | int udbg_read(char *buf, int buflen) | ||
126 | { | ||
127 | char *p = buf; | ||
128 | int i, c; | ||
129 | |||
130 | if (!udbg_getc) | ||
131 | return 0; | ||
132 | |||
133 | for (i = 0; i < buflen; ++i) { | ||
134 | do { | ||
135 | c = udbg_getc(); | ||
136 | if (c == -1 && i == 0) | ||
137 | return -1; | ||
138 | |||
139 | } while (c == 0x11 || c == 0x13); | ||
140 | if (c == 0 || c == -1) | ||
141 | break; | ||
142 | *p++ = c; | ||
143 | } | ||
144 | |||
145 | return i; | ||
146 | } | ||
147 | |||
148 | #define UDBG_BUFSIZE 256 | 125 | #define UDBG_BUFSIZE 256 |
149 | void udbg_printf(const char *fmt, ...) | 126 | void udbg_printf(const char *fmt, ...) |
150 | { | 127 | { |