diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2012-10-09 00:20:29 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 20:59:37 -0500 |
commit | eb1c2abb611b51a935cdb36bbc0e364958ccb83c (patch) | |
tree | 91e00bce431972be7fcf08e1715ef6d893c7866c /arch/powerpc/xmon/nonstdio.c | |
parent | 6432200aa8de3242d64c02e0bf29305147df0171 (diff) |
powerpc/xmon: Remove unused xmon_expect() & xmon_read_poll()
It looks like xmon_expect() was used for doing xmon over a modem (!?),
that code was dropped in 2005 in commit 51d3082 "Unify udbg (#2)".
Once xmon_expect() is gone xmon_read_poll() is unused, drop it too.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/xmon/nonstdio.c')
-rw-r--r-- | arch/powerpc/xmon/nonstdio.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/powerpc/xmon/nonstdio.c b/arch/powerpc/xmon/nonstdio.c index bfac84fbe78..a225d804665 100644 --- a/arch/powerpc/xmon/nonstdio.c +++ b/arch/powerpc/xmon/nonstdio.c | |||
@@ -23,33 +23,6 @@ static char line[256]; | |||
23 | static char *lineptr; | 23 | static char *lineptr; |
24 | static int lineleft; | 24 | static int lineleft; |
25 | 25 | ||
26 | int xmon_expect(const char *str, unsigned long timeout) | ||
27 | { | ||
28 | int c; | ||
29 | unsigned long t0; | ||
30 | |||
31 | /* assume 25MHz default timebase if tb_ticks_per_sec not set yet */ | ||
32 | timeout *= tb_ticks_per_sec? tb_ticks_per_sec: 25000000; | ||
33 | t0 = get_tbl(); | ||
34 | do { | ||
35 | lineptr = line; | ||
36 | for (;;) { | ||
37 | c = xmon_read_poll(); | ||
38 | if (c == -1) { | ||
39 | if (get_tbl() - t0 > timeout) | ||
40 | return 0; | ||
41 | continue; | ||
42 | } | ||
43 | if (c == '\n') | ||
44 | break; | ||
45 | if (c != '\r' && lineptr < &line[sizeof(line) - 1]) | ||
46 | *lineptr++ = c; | ||
47 | } | ||
48 | *lineptr = 0; | ||
49 | } while (strstr(line, str) == NULL); | ||
50 | return 1; | ||
51 | } | ||
52 | |||
53 | int xmon_getchar(void) | 26 | int xmon_getchar(void) |
54 | { | 27 | { |
55 | int c; | 28 | int c; |