net: tftp: Remove tftp_init_load_addr error path

tftp_init_load_addr() always returns 0 since commit af45c84871e4 ("tftp:
rework the logic to validate the load address"), so we don't need to
check if it failed and can remove the error handling.
Also change tftp_init_load_addr() to static void since the return value
is now unused.

Signed-off-by: Leonard Anderweit <l.anderweit@phytec.de>
Reviewed-by: Yannic Moog <y.moog@phytec.de>

diff --git a/net/tftp.c b/net/tftp.c
index 1760877107faef57107cb04c484157750ff63602..3b0f4cd2006e2708776a5799fc02378af7fd708e 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -714,10 +714,9 @@ static void tftp_timeout_handler(void)
        }
 }
 
-static int tftp_init_load_addr(void)
+static void tftp_init_load_addr(void)
 {
        tftp_load_addr = image_load_addr;
-       return 0;
 }
 
 static int saved_tftp_block_size_option;
@@ -901,13 +900,7 @@ void tftp_start(enum proto_t protocol)
        } else
 #endif
        {
-               if (tftp_init_load_addr()) {
-                       eth_halt();
-                       net_set_state(NETLOOP_FAIL);
-                       puts("\nTFTP error: ");
-                       puts("trying to overwrite reserved memory...\n");
-                       return;
-               }
+               tftp_init_load_addr();
                printf("Load address: 0x%lx\n", tftp_load_addr);
                puts("Loading: *\b");
                tftp_state = STATE_SEND_RRQ;
@@ -953,12 +946,7 @@ void tftp_start_server(void)
 {
        tftp_filename[0] = 0;
 
-       if (tftp_init_load_addr()) {
-               eth_halt();
-               net_set_state(NETLOOP_FAIL);
-               puts("\nTFTP error: trying to overwrite reserved memory...\n");
-               return;
-       }
+       tftp_init_load_addr();
        printf("Using %s device\n", eth_get_name());
        printf("Listening for TFTP transfer on %pI4\n", &net_ip);
        printf("Load address: 0x%lx\n", tftp_load_addr);