From: Thierry Reding <treding@nvidia.com>
Date: Mon, 3 Feb 2025 13:55:03 +0000 (+0100)
Subject: soc/tegra: pmc: Do not rely on global variable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1fd5ad68acd3c3a76651c811e1fdb4846237370;p=thirdparty%2Fkernel%2Flinux.git

soc/tegra: pmc: Do not rely on global variable

The reset action for changing the suspend mode back on failure can take
a context-specific data argument that can be set to the PMC context in
order to avoid relying on a global variable.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---

diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index 9cfa7c3d5cae6..750fe29f4cf59 100644
--- a/drivers/soc/tegra/pmc.c
+++ b/drivers/soc/tegra/pmc.c
@@ -2944,6 +2944,8 @@ static int tegra_pmc_regmap_init(struct tegra_pmc *pmc)
 
 static void tegra_pmc_reset_suspend_mode(void *data)
 {
+	struct tegra_pmc *pmc = data;
+
 	pmc->suspend_mode = TEGRA_SUSPEND_NOT_READY;
 }
 
@@ -2966,7 +2968,7 @@ static int tegra_pmc_probe(struct platform_device *pdev)
 		return err;
 
 	err = devm_add_action_or_reset(&pdev->dev, tegra_pmc_reset_suspend_mode,
-				       NULL);
+				       pmc);
 	if (err)
 		return err;