| Message ID | 20230912064946.1405848-1-xiaolei.wang@windriver.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: cdns3: Modify the return value of cdns_set_active () to void when CONFIG_PM_SLEEP is disabled | expand |
On 12/09/2023 09:49, 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 <pavel@denx.de> > Closes: https://lore.kernel.org/all/ZP7lIKUzD68XA91j@duo.ucw.cz/ > Fixes: 2319b9c87fe2 ("usb: cdns3: Put the cdns set active part outside the spin lock") > Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> > --- Reviewed-by: Roger Quadros <rogerq@kernel.org>
Hi Xiaolei, On 12/09/2023 09:49, 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 <pavel@denx.de> > Closes: https://lore.kernel.org/all/ZP7lIKUzD68XA91j@duo.ucw.cz/ > Fixes: 2319b9c87fe2 ("usb: cdns3: Put the cdns set active part outside the spin lock") > Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> Should this be CC to stable as the original patch which this patch is fixing has made it into the stable trees. > --- > 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 */
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 */
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@denx.de> Closes: https://lore.kernel.org/all/ZP7lIKUzD68XA91j@duo.ucw.cz/ Fixes: 2319b9c87fe2 ("usb: cdns3: Put the cdns set active part outside the spin lock") Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> --- drivers/usb/cdns3/core.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)