Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / blackfin / kernel / ftrace.c

diff --git a/arch/blackfin/kernel/ftrace.c b/arch/blackfin/kernel/ftrace.c
index 9277905b82cf27efacef0cf5f83bc00af838d7db..095de0fa044d0eae0a698e8f02fae14329b4cfb0 100644 (file)
--- a/arch/blackfin/kernel/ftrace.c
+++ b/arch/blackfin/kernel/ftrace.c
@@ -65,11 +65,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
        return ftrace_modify_code(ip, call, sizeof(call));
 }
 
-int __init ftrace_dyn_arch_init(void *data)
+int __init ftrace_dyn_arch_init(void)
 {
-       /* return value is done indirectly via data */
-       *(unsigned long *)data = 0;
-
        return 0;
 }