Skip to contentSkip to conversation

spi: designware_spi: Disable and free clock when remove driver

PATCH Superseded Ley Foon Tan 2 participants 2 messages Sep 7, 2018 SPI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: designware_spi: Disable and free clock when remove driver

Disable and free clock when remove driver.

---
 drivers/spi/designware_spi.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/spi/designware_spi.c +13 -1
index 5cca414..f4d36cf 100644
@@ -516,8 +516,20 @@ static int dw_spi_set_mode(struct udevice *bus, uint mode)
 static int dw_spi_remove(struct udevice *bus)
 {
 	struct dw_spi_priv *priv = dev_get_priv(bus);
+	int ret;
 
-	return reset_release_bulk(&priv->resets);
+	ret = reset_release_bulk(&priv->resets);
+	if (ret)
+		return ret;
+
+#if CONFIG_IS_ENABLED(CLK)
+	ret = clk_disable(&priv->clk);
+	if (ret)
+		return ret;
+
+	ret = clk_free(&priv->clk);
+#endif
+	return ret;
 }
 
 static const struct dm_spi_ops dw_spi_ops = {
Signature · 1 line
2.2.2
#1 lore raw

PATCH 1/1 spi: designware_spi: Disable and free clock when remove driver

Quoted 19 lines · Ley Foon Tan

Disable and free clock when remove driver.

---
 drivers/spi/designware_spi.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/spi/designware_spi.c +2 -1
index 5cca414..f4d36cf 100644
@@ -516,8 +516,20 @@ static int dw_spi_set_mode(struct udevice *bus, uint mode)
 static int dw_spi_remove(struct udevice *bus)
 {
 	struct dw_spi_priv *priv = dev_get_priv(bus);
+	int ret;
 
-	return reset_release_bulk(&priv->resets);
+	ret = reset_release_bulk(&priv->resets);

drivers/spi/designware_spi.c static int dw_spi_set_mode(struct udevice *bus, uint mode) · line 531

Quoted 10 lines
drivers/spi/designware_spi.c +10 -0
+	if (ret)
+		return ret;
+
+#if CONFIG_IS_ENABLED(CLK)
+	ret = clk_disable(&priv->clk);
+	if (ret)
+		return ret;
+
+	ret = clk_free(&priv->clk);
+#endif

With CONFIG_CLK = n, you basically get

ret = reset_release_bulk();
if (ret)
return ret;

return ret;

Just check the return value from clk_free() with if (ret) and then finally return 0;

ret = reset_release_bulk();
if (ret)
return ret;

#if ....
ret = clk_...
if (ret)
return ret;
...
#endif

return 0;

Quoted 5 lines
drivers/spi/designware_spi.c +1 -0
+	return ret;
 }
 
 static const struct dm_spi_ops dw_spi_ops = {
Signature · 2 lines
Best regards,
Marek Vasut