2023-09-12 09:07:30

by Xiaolei Wang

[permalink] [raw]
Subject: [PATCH] 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")
Signed-off-by: Xiaolei Wang <[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-20 07:06:25

by Pavel Machek

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

Hi!

> 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.
>

Reviewed-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")

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Attachments:
(No filename) (553.00 B)
 signature.asc (201.00 B)
 Download all attachments

2023-09-20 07:34:30

by Roger Quadros

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



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 <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Fixes: 2319b9c87fe2 ("usb: cdns3: Put the cdns set active part outside the spin lock")
> Signed-off-by: Xiaolei Wang <[email protected]>
> ---

Reviewed-by: Roger Quadros <[email protected]>

2023-09-20 07:44:02

by Roger Quadros

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

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 <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Fixes: 2319b9c87fe2 ("usb: cdns3: Put the cdns set active part outside the spin lock")
> Signed-off-by: Xiaolei Wang <[email protected]>

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 */

--
cheers,
-roger

2023-09-20 08:46:27

by Xiaolei Wang

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


On 9/20/23 3:29 PM, Roger Quadros wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> 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 <[email protected]>
>> Closes: https://lore.kernel.org/all/[email protected]/
>> Fixes: 2319b9c87fe2 ("usb: cdns3: Put the cdns set active part outside the spin lock")
>> Signed-off-by: Xiaolei Wang <[email protected]>
> Should this be CC to stable as the original patch which this patch is
> fixing has made it into the stable trees.

Oh yes, I will send a v2 version with Cc: [email protected],

thanks

xiaolei

>
>> ---
>> 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 */
> --
> cheers,
> -roger