From: Philipp Zabel
Date: Wed, 19 Jul 2017 15:25:09 +0000 (+0200)
Subject: ata: sata_gemini: explicitly request exclusive reset control
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=afbd39a42e2d777852a2809298fd4e71b1e5abf7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git
ata: sata_gemini: explicitly request exclusive reset control
Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls
to explicitly state whether the driver needs exclusive or shared reset
control behavior. Convert all drivers requesting exclusive resets to the
explicit API call so the temporary transition helpers can be removed.
No functional changes.
Cc: linux-ide@vger.kernel.org
Signed-off-by: Philipp Zabel
Acked-by: Linus Walleij
Signed-off-by: Tejun Heo
---
diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
index ab97be63d196..373051ea8211 100644
--- a/drivers/ata/sata_gemini.c
+++ b/drivers/ata/sata_gemini.c
@@ -274,14 +274,14 @@ static int gemini_sata_bridge_init(struct sata_gemini *sg)
return ret;
}
- sg->sata0_reset = devm_reset_control_get(dev, "sata0");
+ sg->sata0_reset = devm_reset_control_get_exclusive(dev, "sata0");
if (IS_ERR(sg->sata0_reset)) {
dev_err(dev, "no SATA0 reset controller\n");
clk_disable_unprepare(sg->sata1_pclk);
clk_disable_unprepare(sg->sata0_pclk);
return PTR_ERR(sg->sata0_reset);
}
- sg->sata1_reset = devm_reset_control_get(dev, "sata1");
+ sg->sata1_reset = devm_reset_control_get_exclusive(dev, "sata1");
if (IS_ERR(sg->sata1_reset)) {
dev_err(dev, "no SATA1 reset controller\n");
clk_disable_unprepare(sg->sata1_pclk);