]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: renesas: cpg-mssr: Remove superfluous check in resume code
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 11 Jan 2023 08:23:34 +0000 (09:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Mar 2024 12:21:51 +0000 (13:21 +0100)
[ Upstream commit 1c052043c79af5f70e80e2acd4dd70904ae08666 ]

When the code flow arrives at printing the error message in
cpg_mssr_resume_noirq(), we know for sure that we are not running on an
RZ/A Soc, as the code checked for that before.

Fixes: ace342097768e35f ("clk: renesas: cpg-mssr: Fix STBCR suspend/resume handling")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/144a3e66d748c0c17f3524ac8fa6ece5bf5b6f1e.1673425314.git.geert+renesas@glider.be
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/renesas/renesas-cpg-mssr.c

index ed67b90fc1b0cfc776dfdd6a7fb26dcda71336ce..54c5d35fe2ae32583e9588b445b86f7bfa612772 100644 (file)
@@ -911,9 +911,8 @@ static int cpg_mssr_resume_noirq(struct device *dev)
                }
 
                if (!i)
-                       dev_warn(dev, "Failed to enable %s%u[0x%x]\n",
-                                priv->reg_layout == CLK_REG_LAYOUT_RZ_A ?
-                                "STB" : "SMSTP", reg, oldval & mask);
+                       dev_warn(dev, "Failed to enable SMSTP%u[0x%x]\n", reg,
+                                oldval & mask);
        }
 
        return 0;