2023-09-20 13:22:28

by Xiaolei Wang

Subject: [PATCH v2] 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: 2319b9c87fe2 ("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]>

v2:
* Add Cc: [email protected]

---
drivers/usb/cdns3/core.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 4a4dbc2c1561..81a9c9d6be08 100644
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -131,8 +131,7 @@ void cdns_set_active(struct cdns *cdns, u8 set_active);
#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 */
--
2.25.1

2023-09-21 22:14:17

by Greg Kroah-Hartman

Subject: Re: [PATCH v2] usb: cdns3: Modify the return value of cdns_set_active () to void when CONFIG_PM_SLEEP is disabled

On Wed, Sep 20, 2023 at 04:28:56PM +0800, Xiaolei Wang wrote:
> 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: 2319b9c87fe2 ("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]>
>
> v2:
> * Add Cc: [email protected]

The changes here need to go below the --- line as the documentation
asks. Putting it here will just break things :(

v3 please?

thanks,

greg k-h