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>

diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
index 821ca31effe71ce837cc57e229bb43f6ee265d25..530ee26b301210d13b6dc854bdee5ec41b552fe6 100644 (file)
--- a/drivers/ata/sata_gemini.c
+++ b/drivers/ata/sata_gemini.c
@@ -11,7 +11,6 @@
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 #include <linux/delay.h>
-#include <linux/reset.h>
 #include <linux/of.h>
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -27,8 +26,6 @@
  * @muxmode: the current muxing mode
  * @ide_pins: if the device is using the plain IDE interface pins
  * @sata_bridge: if the device enables the SATA bridge
- * @sata0_reset: SATA0 reset handler
- * @sata1_reset: SATA1 reset handler
  * @sata0_pclk: SATA0 PCLK handler
  * @sata1_pclk: SATA1 PCLK handler
  */
@@ -38,8 +35,6 @@ struct sata_gemini {
        enum gemini_muxmode muxmode;
        bool ide_pins;
        bool sata_bridge;
-       struct reset_control *sata0_reset;
-       struct reset_control *sata1_reset;
        struct clk *sata0_pclk;
        struct clk *sata1_pclk;
 };
@@ -253,21 +248,6 @@ static int gemini_sata_bridge_init(struct sata_gemini *sg)
                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_phy_id = readl(sg->base + GEMINI_SATA_PHY_ID);
        sg->sata_bridge = true;