Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17761a1c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

clk: renesas: cpg-mssr: Remove superfluous check in resume code 



[ 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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/144a3e66d748c0c17f3524ac8fa6ece5bf5b6f1e.1673425314.git.geert+renesas@glider.be


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8ff19db9

drivers/clk/renesas/renesas-cpg-mssr.c

+2 −3
Original line number Diff line number Diff line
@@ -862,9 +862,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;