From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 17 Dec 2008 02:47:59 +0000 (+0900)
Subject: sh: Kill off sh_bios_in_gdb_mode().
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ca0c14e447a399eb90a1c9a4357560c2a29ef499;p=deliverable%2Flinux.git

sh: Kill off sh_bios_in_gdb_mode().

With the reworked kgdb support, we always detach and reinitialize the
stub. This was mostly a feature for handoffs between sh-ipl+g and the
kgdb stub, but virtually no sh-ipl+g versions ever had this working
right in the first place.

Given that the sh-ipl+g stubs in general use today don't even support
the GDB stub, and we have already killed off the special casing in the
sh-sci serial driver, kill off this now unused symbol too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/include/asm/sh_bios.h b/arch/sh/include/asm/sh_bios.h
index 0ca261956e3d..d9c96d7cf6c7 100644
--- a/arch/sh/include/asm/sh_bios.h
+++ b/arch/sh/include/asm/sh_bios.h
@@ -10,7 +10,6 @@
 
 extern void sh_bios_console_write(const char *buf, unsigned int len);
 extern void sh_bios_char_out(char ch);
-extern int sh_bios_in_gdb_mode(void);
 extern void sh_bios_gdb_detach(void);
 
 extern void sh_bios_get_node_addr(unsigned char *node_addr);
diff --git a/arch/sh/kernel/sh_bios.c b/arch/sh/kernel/sh_bios.c
index ae64e6df2957..c852f7805728 100644
--- a/arch/sh/kernel/sh_bios.c
+++ b/arch/sh/kernel/sh_bios.c
@@ -9,11 +9,9 @@
 #include <asm/sh_bios.h>
 
 #define BIOS_CALL_CONSOLE_WRITE		0
-#define BIOS_CALL_READ_BLOCK		1
 #define BIOS_CALL_ETH_NODE_ADDR		10
 #define BIOS_CALL_SHUTDOWN		11
 #define BIOS_CALL_CHAR_OUT		0x1f	/* TODO: hack */
-#define BIOS_CALL_GDB_GET_MODE_PTR	0xfe
 #define BIOS_CALL_GDB_DETACH		0xff
 
 static inline long sh_bios_call(long func, long arg0, long arg1, long arg2,
@@ -41,21 +39,6 @@ void sh_bios_char_out(char ch)
 	sh_bios_call(BIOS_CALL_CHAR_OUT, ch, 0, 0, 0);
 }
 
-int sh_bios_in_gdb_mode(void)
-{
-	static char queried = 0;
-	static char *gdb_mode_p = 0;
-
-	if (!queried) {
-		/* Query the gdb stub for address of its gdb mode variable */
-		long r = sh_bios_call(BIOS_CALL_GDB_GET_MODE_PTR, 0, 0, 0, 0);
-		if (r != ~0)	/* BIOS returns -1 for unknown function */
-			gdb_mode_p = (char *)r;
-		queried = 1;
-	}
-	return (gdb_mode_p != 0 ? *gdb_mode_p : 0);
-}
-
 void sh_bios_gdb_detach(void)
 {
 	sh_bios_call(BIOS_CALL_GDB_DETACH, 0, 0, 0, 0);