diff --git a/include/linux/init.h b/include/linux/init.h
index 847e8536228f..9ef90a312a6f 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -167,20 +167,6 @@ extern bool initcall_debug;
 
 #ifndef __ASSEMBLY__
 
-#ifdef CONFIG_LTO_CLANG
-  /*
-   * Use __COUNTER__ prefix in the variable to help ensure ordering
-   * inside a compilation unit that defines multiple initcalls, and
-   * __LINE__ to help prevent naming collisions.
-   */
-  #define ___initcall_name2(c, l, fn, id) __initcall_##c##_##l##_##fn##id
-  #define ___initcall_name1(c, l, fn, id) ___initcall_name2(c, l, fn, id)
-  #define __initcall_name(fn, id) \
-		___initcall_name1(__COUNTER__, __LINE__, fn, id)
-#else
-  #define __initcall_name(fn, id) 	__initcall_##fn##id
-#endif
-
 /*
  * initcalls are now grouped by functionality into separate
  * subsections. Ordering inside the subsections is determined
@@ -201,12 +187,12 @@ extern bool initcall_debug;
 #define ___define_initcall(fn, id, __sec)			\
 	__ADDRESSABLE(fn)					\
 	asm(".section	\"" #__sec ".init\", \"a\"	\n"	\
-	__stringify(__initcall_name(fn, id)) ":		\n"	\
+	"__initcall_" #fn #id ":			\n"	\
 	    ".long	" #fn " - .			\n"	\
 	    ".previous					\n");
 #else
 #define ___define_initcall(fn, id, __sec) \
-	static initcall_t __initcall_name(fn, id) __used \
+	static initcall_t __initcall_##fn##id __used \
 		__attribute__((__section__(#__sec ".init"))) = fn;
 #endif