2024-04-24 05:02:47

by Portia Stephens

[permalink] [raw]

Subject: [PATCH] cpufreq: brcmstb-avs-cpufreq: ISO C90 forbids mixed declarations

---

There is a compile warning because a NULL pointer check was added before
a struct was declared. This moves the NULL pointer check to after the
struct is delcared and moves the struct assignment to after the NULL
pointer check.

Fixes: f661017e6d32 ("cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return value")

Signed-off-by: Portia Stephens <[email protected]>
---
drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
index 1a1857b0a6f4..ea8438550b49 100644
--- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
+++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
@@ -481,9 +481,12 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)
static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)
{
struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
+ struct private_data *priv;
+
if (!policy)
return 0;
- struct private_data *priv = policy->driver_data;
+
+ priv = policy->driver_data;

cpufreq_cpu_put(policy);

--
2.34.1

2024-04-24 15:01:37

by Florian Fainelli

[permalink] [raw]

Subject: Re: [PATCH] cpufreq: brcmstb-avs-cpufreq: ISO C90 forbids mixed declarations

---

On 4/23/2024 10:02 PM, Portia Stephens wrote:
> There is a compile warning because a NULL pointer check was added before
> a struct was declared. This moves the NULL pointer check to after the
> struct is delcared and moves the struct assignment to after the NULL
> pointer check.
>
> Fixes: f661017e6d32 ("cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return value")

No need for a newline between the Fixes: and Signed-off-by: tags, FWIW

>
> Signed-off-by: Portia Stephens <[email protected]>

Acked-by: Florian Fainelli <[email protected]>

> ---
> drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
> index 1a1857b0a6f4..ea8438550b49 100644
> --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
> +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
> @@ -481,9 +481,12 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)
> static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)
> {
> struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
> + struct private_data *priv;
> +
> if (!policy)
> return 0;
> - struct private_data *priv = policy->driver_data;
> +
> + priv = policy->driver_data;
>
> cpufreq_cpu_put(policy);
>

--
Florian

---

Attachments:

smime.p7s (4.12 kB)
S/MIME Cryptographic Signature

2024-04-25 05:07:35

by Viresh Kumar

[permalink] [raw]

Subject: Re: [PATCH] cpufreq: brcmstb-avs-cpufreq: ISO C90 forbids mixed declarations

---

On 24-04-24, 15:02, Portia Stephens wrote:
> There is a compile warning because a NULL pointer check was added before
> a struct was declared. This moves the NULL pointer check to after the
> struct is delcared and moves the struct assignment to after the NULL

declared

> pointer check.
>
> Fixes: f661017e6d32 ("cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return value")
>
> Signed-off-by: Portia Stephens <[email protected]>
> ---
> drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)

Applied. Thanks.

--
viresh