usb: typec: ucsi: fix ucsi_register_port_psy typo
Subsystems (2)
PATCH 1/1 usb: typec: ucsi: fix ucsi_register_port_psy typo
The dummy function in the header file has the wrong name, conflicting with a local ucsi_register_port function:
drivers/usb/typec/ucsi/ucsi.c:890:12: error: conflicting types for 'ucsi_register_port'
890 | static int ucsi_register_port(struct ucsi *ucsi, int index)
| ^~~~~~~~~~~~~~~~~~
In file included from drivers/usb/typec/ucsi/ucsi.c:17:
drivers/usb/typec/ucsi/ucsi.h:344:19: note: previous definition of 'ucsi_register_port' was here
344 | static inline int ucsi_register_port(struct ucsi_connector *con) { return 0; }
| ^~~~~~~~~~~~~~~~~~
drivers/usb/typec/ucsi/ucsi.c: In function 'ucsi_register_port':
drivers/usb/typec/ucsi/ucsi.c:939:8: error: implicit declaration of function 'ucsi_register_port_psy'; did you mean 'ucsi_unregister_port_psy'? [-Werror=implicit-function-declaration]
939 | ret = ucsi_register_port_psy(con);
| ^~~~~~~~~~~~~~~~~~~~~~
| ucsi_unregister_port_psyFixes 992a60ed0d5e ("usb: typec: ucsi: register with power_supply class")
Signed-off-by Arnd Bergmann <[email protected]>
--- drivers/usb/typec/ucsi/ucsi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/ucsi/ucsi.h +1 -1
@@ -341,7 +341,7 @@ int ucsi_resume(struct ucsi *ucsi);int ucsi_register_port_psy (struct ucsi_connector *con);void ucsi_unregister_port_psy (struct ucsi_connector *con);#else -static inline int ucsi_register_port (struct ucsi_connector *con) {return 0 ; } +static inline int ucsi_register_port_psy (struct ucsi_connector *con) {return 0 ; }static inline void ucsi_unregister_port_psy (struct ucsi_connector *con) { }#endif /* CONFIG_POWER_SUPPLY */
Signature · 1 line
2.26.0
Greg Kroah-Hartman
maintainerQuoted 38 lines · Arnd Bergmann
The dummy function in the header file has the wrong name, conflicting with a local
ucsi_register_portfunction:
drivers/usb/typec/ucsi/ucsi.c:890:12: error: conflicting types for 'ucsi_register_port'
890 | static intucsi_register_port(struct ucsi *ucsi, int index)| ^~~~~~~~~~~~~~~~~~ In file included from drivers/usb/typec/ucsi/ucsi.c:17: drivers/usb/typec/ucsi/ucsi.h:344:19: note: previous definition of 'ucsi_register_port' was here 344 | static inline int ucsi_register_port(struct ucsi_connector *con) { return 0; } | ^~~~~~~~~~~~~~~~~~ drivers/usb/typec/ucsi/ucsi.c: In function 'ucsi_register_port': drivers/usb/typec/ucsi/ucsi.c:939:8: error: implicit declaration of function 'ucsi_register_port_psy'; did you mean 'ucsi_unregister_port_psy'? [-Werror=implicit-function-declaration] 939 | ret = ucsi_register_port_psy(con); | ^~~~~~~~~~~~~~~~~~~~~~ | ucsi_unregister_port_psyFixes 992a60ed0d5e ("usb: typec: ucsi: register with power_supply class")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/usb/typec/ucsi/ucsi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/typec/ucsi/ucsi.h +1
-1@@ -341,7 +341,7 @@ int ucsi_resume(struct ucsi *ucsi);int ucsi_register_port_psy (struct ucsi_connector *con);void ucsi_unregister_port_psy (struct ucsi_connector *con);#else -static inline int ucsi_register_port (struct ucsi_connector *con) {return 0 ; } +static inline int ucsi_register_port_psy (struct ucsi_connector *con) {return 0 ; }static inline void ucsi_unregister_port_psy (struct ucsi_connector *con) { }#endif /* CONFIG_POWER_SUPPLY */ Signature · 1 line
2.26.0
This was sent yesterday and will show up in the next linux-next release, sorry for the delay.
greg k-h