[OpenBIOS] [PATCH 15/24] SPARC64: remove start_client_image()

[Mark Cave-Ayland]

Since the client context is now set by arch_init_program(), start_elf() and
start_client_image() are now identical so the latter can be removed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>
---
 arch/sparc64/boot.c    |    8 ++++----
 arch/sparc64/boot.h    |    1 -
 arch/sparc64/context.c |   12 ------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/arch/sparc64/boot.c b/arch/sparc64/boot.c
index 08d7f51..9eac52c 100644
--- a/arch/sparc64/boot.c
+++ b/arch/sparc64/boot.c
@@ -41,22 +41,22 @@ void go(void)
 
 		case 0x1:
 			/* Start ELF image */
-			image_retval = start_client_image(address, (uint64_t)&sparc64_of_client_interface);
+			image_retval = start_elf(address);
 			break;
 
 		case 0x5:
 			/* Start a.out image */
-			image_retval = start_client_image(address, (uint64_t)&sparc64_of_client_interface);
+			image_retval = start_elf(address);
 			break;
 
 		case 0x10:
 			/* Start Fcode image */
-			image_retval = start_client_image((uint64_t)&init_fcode_context, (uint64_t)&sparc64_of_client_interface);
+			image_retval = start_elf((unsigned long)&init_fcode_context);
 			break;
 
 		case 0x11:
 			/* Start Forth image */
-			image_retval = start_client_image((uint64_t)&init_forth_context, (uint64_t)&sparc64_of_client_interface);
+			image_retval = start_elf((unsigned long)&init_forth_context);
 			break;
 	}
 
diff --git a/arch/sparc64/boot.h b/arch/sparc64/boot.h
index aa9894e..d7ca862 100644
--- a/arch/sparc64/boot.h
+++ b/arch/sparc64/boot.h
@@ -12,7 +12,6 @@ int linux_load(struct sys_info *info, const char *file, const char *cmdline);
 // context.c
 extern struct context * volatile __context;
 unsigned int start_elf(unsigned long entry_point);
-uint64_t start_client_image(uint64_t entry_point, uint64_t cif_handler);
 
 // boot.c
 extern uint64_t kernel_image;
diff --git a/arch/sparc64/context.c b/arch/sparc64/context.c
index f07f1ef..ed4d878 100644
--- a/arch/sparc64/context.c
+++ b/arch/sparc64/context.c
@@ -148,15 +148,3 @@ unsigned int start_elf(unsigned long entry_point)
 
     return 0;
 }
-
-/* Start client image */
-uint64_t start_client_image(uint64_t entry_point, uint64_t cif_handler)
-{
-    struct context *ctx = client_ctx;
-
-    arch_init_program();
-
-    ctx = switch_to(ctx);
-
-    return 0;
-}
-- 
1.7.10.4