diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index cb32a838ea5c..50247e9f3016 100644
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -1984,7 +1984,6 @@ typec_port_register_altmode(struct typec_port *port,
 }
 EXPORT_SYMBOL_GPL(typec_port_register_altmode);
 
-#ifdef CONFIG_NO_GKI
 void typec_port_register_altmodes(struct typec_port *port,
 	const struct typec_altmode_ops *ops, void *drvdata,
 	struct typec_altmode **altmodes, size_t n)
@@ -2038,7 +2037,6 @@ void typec_port_register_altmodes(struct typec_port *port,
 	}
 }
 EXPORT_SYMBOL_GPL(typec_port_register_altmodes);
-#endif /* CONFIG_NO_GKI */
 
 /**
  * typec_register_port - Register a USB Type-C Port
diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h
index 34cc102b3862..88594260074d 100644
--- a/include/linux/usb/typec.h
+++ b/include/linux/usb/typec.h
@@ -141,17 +141,9 @@ struct typec_altmode
 *typec_port_register_altmode(struct typec_port *port,
 			     const struct typec_altmode_desc *desc);
 
-#ifdef CONFIG_NO_GKI
 void typec_port_register_altmodes(struct typec_port *port,
 	const struct typec_altmode_ops *ops, void *drvdata,
 	struct typec_altmode **altmodes, size_t n);
-#else
-static inline void typec_port_register_altmodes(struct typec_port *port,
-	const struct typec_altmode_ops *ops, void *drvdata,
-	struct typec_altmode **altmodes, size_t n)
-{
-}
-#endif
 
 void typec_unregister_altmode(struct typec_altmode *altmode);