Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ata: sata_gemini: Remove remaining reset glue

Browse Source 
Now that gemini_sata_reset_bridge() is gone, we can remove
the sata0/1_reset members and the code that creates them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
This commit is contained in:
Dr. David Alan Gilbert 2024-12-11 23:52:50 +00:00 committed by Damien Le Moal
parent a7f08ca7df
commit 7b64859fde
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/ata/sata_gemini.c
View File

@ -11,7 +11,6 @@
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/reset.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
@ -27,8 +26,6 @@
* @muxmode: the current muxing mode * @muxmode: the current muxing mode
* @ide_pins: if the device is using the plain IDE interface pins * @ide_pins: if the device is using the plain IDE interface pins
* @sata_bridge: if the device enables the SATA bridge * @sata_bridge: if the device enables the SATA bridge
* @sata0_reset: SATA0 reset handler
* @sata1_reset: SATA1 reset handler
* @sata0_pclk: SATA0 PCLK handler * @sata0_pclk: SATA0 PCLK handler
* @sata1_pclk: SATA1 PCLK handler * @sata1_pclk: SATA1 PCLK handler
*/ */
@ -38,8 +35,6 @@ struct sata_gemini {
enum gemini_muxmode muxmode; enum gemini_muxmode muxmode;
bool ide_pins; bool ide_pins;
bool sata_bridge; bool sata_bridge;
struct reset_control *sata0_reset;
struct reset_control *sata1_reset;
struct clk *sata0_pclk; struct clk *sata0_pclk;
struct clk *sata1_pclk; struct clk *sata1_pclk;
}; };
@ -253,21 +248,6 @@ static int gemini_sata_bridge_init(struct sata_gemini *sg)
return ret; return ret;
} }
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_exclusive(dev, "sata1");
if (IS_ERR(sg->sata1_reset)) {
dev_err(dev, "no SATA1 reset controller\n");
clk_disable_unprepare(sg->sata1_pclk);
clk_disable_unprepare(sg->sata0_pclk);
return PTR_ERR(sg->sata1_reset);
}
sata_id = readl(sg->base + GEMINI_SATA_ID); sata_id = readl(sg->base + GEMINI_SATA_ID);
sata_phy_id = readl(sg->base + GEMINI_SATA_PHY_ID); sata_phy_id = readl(sg->base + GEMINI_SATA_PHY_ID);
sg->sata_bridge = true; sg->sata_bridge = true;