diff --git a/crypto/fips140-module.c b/crypto/fips140-module.c
index cc5c457ddd29..6a5d561890b7 100644
--- a/crypto/fips140-module.c
+++ b/crypto/fips140-module.c
@@ -581,18 +581,8 @@ static bool update_fips140_library_routines(void)
 	return ret == 0;
 }
 
-/*
- * Initialize the FIPS 140 module.
- *
- * Note: this routine iterates over the contents of the initcall section, which
- * consists of an array of function pointers that was emitted by the linker
- * rather than the compiler. This means that these function pointers lack the
- * usual CFI stubs that the compiler emits when CFI codegen is enabled. So
- * let's disable CFI locally when handling the initcall array, to avoid
- * surpises.
- */
-static int __init __attribute__((__no_sanitize__("cfi")))
-fips140_init(void)
+/* Initialize the FIPS 140 module */
+static int __init fips140_init(void)
 {
 	const u32 *initcall;
 
@@ -605,7 +595,7 @@ fips140_init(void)
 	for (initcall = __initcall_start + 1;
 	     initcall < &__initcall_end_marker;
 	     initcall++) {
-		int (*init)(void) = offset_to_ptr(initcall);
+		initcall_t init = offset_to_ptr(initcall);
 		int err = init();
 
 		/*