Skip to content

Commit 9f35d61

Browse files
xiaoleiwang123456gregkh
authored andcommitted
usb: cdns3: Modify the return value of cdns_set_active () to void when CONFIG_PM_SLEEP is disabled
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 <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Fixes: 2319b9c ("usb: cdns3: Put the cdns set active part outside the spin lock") Cc: [email protected] Signed-off-by: Xiaolei Wang <[email protected]> Reviewed-by: Pavel Machek <[email protected]> Reviewed-by: Roger Quadros <[email protected]> Acked-by: Peter Chen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8bea147 commit 9f35d61

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/usb/cdns3/core.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ void cdns_set_active(struct cdns *cdns, u8 set_active);
131131
#else /* CONFIG_PM_SLEEP */
132132
static inline int cdns_resume(struct cdns *cdns)
133133
{ return 0; }
134-
static inline int cdns_set_active(struct cdns *cdns, u8 set_active)
135-
{ return 0; }
134+
static inline void cdns_set_active(struct cdns *cdns, u8 set_active) { }
136135
static inline int cdns_suspend(struct cdns *cdns)
137136
{ return 0; }
138137
#endif /* CONFIG_PM_SLEEP */

0 commit comments

Comments
 (0)