Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"

[PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"

Posted by Colin Ian King 3 weeks, 5 days ago

Currently the condition ((rc != -ENOTSUPP) || (rc != -EINVAL)) is always
true because rc cannot be equal to two different values at the same time,
so it must be not equal to at least one of them. Fix the original commit
that introduced the issue.

This reverts commit 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 drivers/cpufreq/brcmstb-avs-cpufreq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
index 5d03a295a085..2fd0f6be6fa3 100644
--- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
+++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
@@ -474,8 +474,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)
 	rc = brcm_avs_get_pmap(priv, NULL);
 	magic = readl(priv->base + AVS_MBOX_MAGIC);
 
-	return (magic == AVS_FIRMWARE_MAGIC) && ((rc != -ENOTSUPP) ||
-		(rc != -EINVAL));
+	return (magic == AVS_FIRMWARE_MAGIC) && (rc != -ENOTSUPP) &&
+		(rc != -EINVAL);
 }
 
 static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)
-- 
2.39.5

Re: [PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"

Posted by Florian Fainelli 3 weeks, 5 days ago

On 10/29/24 08:22, Colin Ian King wrote:
> Currently the condition ((rc != -ENOTSUPP) || (rc != -EINVAL)) is always
> true because rc cannot be equal to two different values at the same time,
> so it must be not equal to at least one of them. Fix the original commit
> that introduced the issue.
> 
> This reverts commit 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8.
> 
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>

Sorry for not replying earlier on.
-- 
Florian

Re: [PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"

Posted by Viresh Kumar 3 weeks, 4 days ago

On 29-10-24, 10:06, Florian Fainelli wrote:
> On 10/29/24 08:22, Colin Ian King wrote:
> > Currently the condition ((rc != -ENOTSUPP) || (rc != -EINVAL)) is always
> > true because rc cannot be equal to two different values at the same time,
> > so it must be not equal to at least one of them. Fix the original commit
> > that introduced the issue.
> > 
> > This reverts commit 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8.
> > 
> > Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> 
> Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>

Applied. Thanks.

-- 
viresh