From c575feaee97f3c3f0d29ec8e5e4948e08f56cd61 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 7 Nov 2023 18:57:40 +0800 Subject: [PATCH] Revert "usb: typec: typec_port_register_altmodes() depends on CONFIG_NO_GKI" This reverts commit afaeb74a366db2a0e7f29830a7547d0d6d8d3aae. Signed-off-by: Tao Huang --- drivers/usb/typec/class.c | 2 -- include/linux/usb/typec.h | 8 -------- 2 files changed, 10 deletions(-) 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);