Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dr. David Alan Gilbert and committed by
Damien Le Moal
7b64859f a7f08ca7

-20
-20
drivers/ata/sata_gemini.c
··· 11 11 #include <linux/mfd/syscon.h> 12 12 #include <linux/regmap.h> 13 13 #include <linux/delay.h> 14 - #include <linux/reset.h> 15 14 #include <linux/of.h> 16 15 #include <linux/clk.h> 17 16 #include <linux/io.h> ··· 26 27 * @muxmode: the current muxing mode 27 28 * @ide_pins: if the device is using the plain IDE interface pins 28 29 * @sata_bridge: if the device enables the SATA bridge 29 - * @sata0_reset: SATA0 reset handler 30 - * @sata1_reset: SATA1 reset handler 31 30 * @sata0_pclk: SATA0 PCLK handler 32 31 * @sata1_pclk: SATA1 PCLK handler 33 32 */ ··· 35 38 enum gemini_muxmode muxmode; 36 39 bool ide_pins; 37 40 bool sata_bridge; 38 - struct reset_control *sata0_reset; 39 - struct reset_control *sata1_reset; 40 41 struct clk *sata0_pclk; 41 42 struct clk *sata1_pclk; 42 43 }; ··· 246 251 dev_err(dev, "failed to enable SATA1 PCLK\n"); 247 252 clk_disable_unprepare(sg->sata0_pclk); 248 253 return ret; 249 - } 250 - 251 - sg->sata0_reset = devm_reset_control_get_exclusive(dev, "sata0"); 252 - if (IS_ERR(sg->sata0_reset)) { 253 - dev_err(dev, "no SATA0 reset controller\n"); 254 - clk_disable_unprepare(sg->sata1_pclk); 255 - clk_disable_unprepare(sg->sata0_pclk); 256 - return PTR_ERR(sg->sata0_reset); 257 - } 258 - sg->sata1_reset = devm_reset_control_get_exclusive(dev, "sata1"); 259 - if (IS_ERR(sg->sata1_reset)) { 260 - dev_err(dev, "no SATA1 reset controller\n"); 261 - clk_disable_unprepare(sg->sata1_pclk); 262 - clk_disable_unprepare(sg->sata0_pclk); 263 - return PTR_ERR(sg->sata1_reset); 264 254 } 265 255 266 256 sata_id = readl(sg->base + GEMINI_SATA_ID);