From afaeb74a366db2a0e7f29830a7547d0d6d8d3aae Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 3 Sep 2021 18:18:15 +0800 Subject: [PATCH] usb: typec: typec_port_register_altmodes() depends on CONFIG_NO_GKI Signed-off-by: Tao Huang Change-Id: I030231375933eabe85c2c15cc6e9bd96748fa934 --- drivers/usb/typec/class.c | 2 ++ include/linux/usb/typec.h | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index a1fd1f83fdef..998e98a896e1 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -1983,6 +1983,7 @@ 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) @@ -2036,6 +2037,7 @@ 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 88594260074d..34cc102b3862 100644 --- a/include/linux/usb/typec.h +++ b/include/linux/usb/typec.h @@ -141,9 +141,17 @@ 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);