6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiaolei Wang <xiaolei.wang@xxxxxxxxxxxxx> commit 9f35d612da5592f1bf1cae44ec1e023df37bea12 upstream. The return type of cdns_set_active () is inconsistent depending on whether CONFIG_PM_SLEEP is enabled, so the return value is modified to void type. Reported-by: Pavel Machek <pavel@xxxxxxx> Closes: https://lore.kernel.org/all/ZP7lIKUzD68XA91j@xxxxxxxxxx/ Fixes: 2319b9c87fe2 ("usb: cdns3: Put the cdns set active part outside the spin lock") Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Xiaolei Wang <xiaolei.wang@xxxxxxxxxxxxx> Reviewed-by: Pavel Machek <pavel@xxxxxxx> Reviewed-by: Roger Quadros <rogerq@xxxxxxxxxx> Acked-by: Peter Chen <peter.chen@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230926075333.1791011-1-xiaolei.wang@xxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/cdns3/core.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/usb/cdns3/core.h +++ b/drivers/usb/cdns3/core.h @@ -131,8 +131,7 @@ void cdns_set_active(struct cdns *cdns, #else /* CONFIG_PM_SLEEP */ static inline int cdns_resume(struct cdns *cdns) { return 0; } -static inline int cdns_set_active(struct cdns *cdns, u8 set_active) -{ return 0; } +static inline void cdns_set_active(struct cdns *cdns, u8 set_active) { } static inline int cdns_suspend(struct cdns *cdns) { return 0; } #endif /* CONFIG_PM_SLEEP */
