]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
memory: tegra234: drop dead NULL check in tegra234_mc_icc_aggregate()
authorSumit Gupta <sumitg@nvidia.com>
Wed, 27 May 2026 14:01:27 +0000 (19:31 +0530)
committerKrzysztof Kozlowski <krzk@kernel.org>
Tue, 9 Jun 2026 15:00:30 +0000 (17:00 +0200)
In tegra234_mc_icc_aggregate(), the 'if (mc)' check inside the
CPU-cluster branch is always true.  'mc' was already dereferenced
via 'mc->bwmgr_mrq_supported' a few lines above, so if it were NULL
the function would have faulted there.  Drop the redundant check.

Reported-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://patch.msgid.link/20260527140127.49172-4-sumitg@nvidia.com
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
drivers/memory/tegra/tegra234.c

index 9fbd34d4abe0481145ca58f2757d971a5b4c79fb..982476b67d5af1136397b614d03fda75110329db 100644 (file)
@@ -1106,10 +1106,8 @@ static int tegra234_mc_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,
 
        if (node->id == TEGRA_ICC_MC_CPU_CLUSTER0 ||
            node->id == TEGRA_ICC_MC_CPU_CLUSTER1 ||
-           node->id == TEGRA_ICC_MC_CPU_CLUSTER2) {
-               if (mc)
-                       peak_bw = peak_bw * mc->num_channels;
-       }
+           node->id == TEGRA_ICC_MC_CPU_CLUSTER2)
+               peak_bw = peak_bw * mc->num_channels;
 
        *agg_avg += avg_bw;
        *agg_peak = max(*agg_peak, peak_bw);