Skip to content

Commit 7b64859

Browse files
Dr. David Alan Gilbertdamien-lemoal
authored andcommitted
ata: sata_gemini: Remove remaining reset glue
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>
1 parent a7f08ca commit 7b64859

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

drivers/ata/sata_gemini.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/mfd/syscon.h>
1212
#include <linux/regmap.h>
1313
#include <linux/delay.h>
14-
#include <linux/reset.h>
1514
#include <linux/of.h>
1615
#include <linux/clk.h>
1716
#include <linux/io.h>
@@ -27,8 +26,6 @@
2726
* @muxmode: the current muxing mode
2827
* @ide_pins: if the device is using the plain IDE interface pins
2928
* @sata_bridge: if the device enables the SATA bridge
30-
* @sata0_reset: SATA0 reset handler
31-
* @sata1_reset: SATA1 reset handler
3229
* @sata0_pclk: SATA0 PCLK handler
3330
* @sata1_pclk: SATA1 PCLK handler
3431
*/
@@ -38,8 +35,6 @@ struct sata_gemini {
3835
enum gemini_muxmode muxmode;
3936
bool ide_pins;
4037
bool sata_bridge;
41-
struct reset_control *sata0_reset;
42-
struct reset_control *sata1_reset;
4338
struct clk *sata0_pclk;
4439
struct clk *sata1_pclk;
4540
};
@@ -253,21 +248,6 @@ static int gemini_sata_bridge_init(struct sata_gemini *sg)
253248
return ret;
254249
}
255250

256-
sg->sata0_reset = devm_reset_control_get_exclusive(dev, "sata0");
257-
if (IS_ERR(sg->sata0_reset)) {
258-
dev_err(dev, "no SATA0 reset controller\n");
259-
clk_disable_unprepare(sg->sata1_pclk);
260-
clk_disable_unprepare(sg->sata0_pclk);
261-
return PTR_ERR(sg->sata0_reset);
262-
}
263-
sg->sata1_reset = devm_reset_control_get_exclusive(dev, "sata1");
264-
if (IS_ERR(sg->sata1_reset)) {
265-
dev_err(dev, "no SATA1 reset controller\n");
266-
clk_disable_unprepare(sg->sata1_pclk);
267-
clk_disable_unprepare(sg->sata0_pclk);
268-
return PTR_ERR(sg->sata1_reset);
269-
}
270-
271251
sata_id = readl(sg->base + GEMINI_SATA_ID);
272252
sata_phy_id = readl(sg->base + GEMINI_SATA_PHY_ID);
273253
sg->sata_bridge = true;

0 commit comments

Comments
 (0)