iio: jesd204: axi_jesd204_rx: use managed resource in probe

Make use of devm_* variants and devm_add_action_or_reset() for
automatically release the resources allocated in probe. Hence the driver
.remove() hook can be removed. The goal was to keep the same order when
releasing the resource as we had with the .remove() hook. Also note the
move to the advised devm_clk_hw_register() so that we can also make use
of devm_of_clk_add_hw_provider().

While at, remove the unneeded check on irq being 0.

Signed-off-by: Nuno Sa <[email protected]>

Author: nunojsa

drivers/iio/jesd204/axi_jesd204_rx.c

@@ -758,7 +758,6 @@ static int axi_jesd204_register_dummy_clk(struct axi_jesd204_rx *jesd,
 	struct device_node *np = dev->of_node;
 	const char *parent_name, *clk_name;
 	struct clk_init_data init;
-	struct clk *dummy_clk;
 	int ret;
 
 	ret = of_property_read_string(np, "clock-output-names",
@@ -776,13 +775,11 @@ static int axi_jesd204_register_dummy_clk(struct axi_jesd204_rx *jesd,
 
 	jesd->dummy_clk.init = &init;
 
-	dummy_clk = devm_clk_register(dev, &jesd->dummy_clk);
-	if (IS_ERR(dummy_clk))
-		return PTR_ERR(dummy_clk);
-
-	of_clk_add_provider(np, of_clk_src_simple_get, dummy_clk);
+	ret = devm_clk_hw_register(dev, &jesd->dummy_clk);
+	if (ret)
+		return ret;
 
-	return 0;
+	return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &jesd->dummy_clk);
 }
 
 static int axi_jesd204_rx_pcore_check(struct axi_jesd204_rx *jesd)
@@ -1154,6 +1151,32 @@ static void axi_jesd204_rx_create_remove_devattrs(struct device *dev,
 	}
 }
 
+static void axi_jesd204_clk_disable(void *clk)
+{
+	clk_disable_unprepare(clk);
+}
+
+static void axi_jesd204_rx_teardown(void *data)
+{
+	struct axi_jesd204_rx *jesd = data;
+
+	writel_relaxed(0xff, jesd->base + JESD204_RX_REG_IRQ_PENDING);
+	writel_relaxed(0x00, jesd->base + JESD204_RX_REG_IRQ_ENABLE);
+	writel_relaxed(0x1, jesd->base + JESD204_RX_REG_LINK_DISABLE);
+}
+
+static void axi_jesd204_rx_rmattr(void *data)
+{
+	struct axi_jesd204_rx *jesd = data;
+
+	axi_jesd204_rx_create_remove_devattrs(jesd->dev, jesd, false);
+}
+
+static void axi_jesd204_stop_fsm(void *jdev)
+{
+	jesd204_fsm_stop(jdev, JESD204_LINKS_ALL);
+}
+
 static int axi_jesd204_rx_probe(struct platform_device *pdev)
 {
 	struct axi_jesd204_rx *jesd;
@@ -1172,8 +1195,6 @@ static int axi_jesd204_rx_probe(struct platform_device *pdev)
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
 		return irq;
-	if (irq == 0)
-		return -ENXIO;
 
 	jesd = devm_kzalloc(&pdev->dev, sizeof(*jesd), GFP_KERNEL);
 	if (!jesd)
@@ -1207,7 +1228,7 @@ static int axi_jesd204_rx_probe(struct platform_device *pdev)
 	if (IS_ERR(jesd->reset_done_gpio))
 		return PTR_ERR(jesd->reset_done_gpio);
 
-	jesd->axi_clk = devm_clk_get(&pdev->dev, "s_axi_aclk");
+	jesd->axi_clk = devm_clk_get_enabled(&pdev->dev, "s_axi_aclk");
 	if (IS_ERR(jesd->axi_clk))
 		return PTR_ERR(jesd->axi_clk);
 
@@ -1237,18 +1258,19 @@ static int axi_jesd204_rx_probe(struct platform_device *pdev)
 	if (IS_ERR(jesd->sysref_clk))
 		return PTR_ERR(jesd->sysref_clk);
 
-	ret = clk_prepare_enable(jesd->axi_clk);
-	if (ret)
-		return ret;
-
 	jesd->axi_clk_freq = clk_get_rate(jesd->axi_clk);
 	if (!jesd->axi_clk_freq)
 		jesd->axi_clk_freq = 100000000; /* 100 MHz */
 
 	if (jesd->conv2_clk) {
 		ret = clk_prepare_enable(jesd->conv2_clk);
 		if (ret)
-			goto err_axi_clk_disable;
+			return ret;
+
+		ret = devm_add_action_or_reset(&pdev->dev, axi_jesd204_clk_disable,
+					       jesd->conv2_clk);
+		if (ret)
+			return ret;
 	}
 
 	jesd->num_lanes = readl_relaxed(jesd->base + JESD204_RX_REG_SYNTH_NUM_LANES);
@@ -1266,13 +1288,17 @@ static int axi_jesd204_rx_probe(struct platform_device *pdev)
 	} else if (jesd->encoder >= JESD204_ENCODER_MAX) {
 		dev_err(&pdev->dev, "Invalid encoder value from HDL core %u\n",
 			jesd->encoder);
-		goto err_conv2_clk_disable;
+		return ret;
 	}
 
+	ret = devm_add_action_or_reset(&pdev->dev, axi_jesd204_rx_teardown, jesd);
+	if (ret)
+		return ret;
+
 	if (!jesd->jdev) {
 		ret = axi_jesd204_init_non_framework(&pdev->dev, jesd);
 		if (ret)
-			goto err_conv2_clk_disable;
+			return ret;
 	}
 
 	writel_relaxed(0xff, jesd->base + JESD204_RX_REG_IRQ_PENDING);
@@ -1286,7 +1312,7 @@ static int axi_jesd204_rx_probe(struct platform_device *pdev)
 						IRQF_ONESHOT, dev_name(&pdev->dev),
 						jesd);
 		if (ret)
-			goto err_uninit_non_framework;
+			return ret;
 
 		disable_irq(irq);
 
@@ -1300,9 +1326,19 @@ static int axi_jesd204_rx_probe(struct platform_device *pdev)
 
 	axi_jesd204_rx_create_remove_devattrs(&pdev->dev, jesd, true);
 
-	ret = jesd204_fsm_start(jesd->jdev, JESD204_LINKS_ALL);
+	ret = devm_add_action_or_reset(&pdev->dev, axi_jesd204_rx_rmattr, jesd);
 	if (ret)
-		goto err_remove_debugfs;
+		return ret;
+
+	if (jesd->jdev) {
+		ret = jesd204_fsm_start(jesd->jdev, JESD204_LINKS_ALL);
+		if (ret)
+			return ret;
+
+		ret = devm_add_action_or_reset(&pdev->dev, axi_jesd204_stop_fsm, jesd->jdev);
+		if (ret)
+			return ret;
+	}
 
 	dev_info(&pdev->dev, "AXI-JESD204-RX (%d.%.2d.%c). Encoder %s, width %u/%u, lanes %d%s.",
 		 ADI_AXI_PCORE_VER_MAJOR(jesd->version), ADI_AXI_PCORE_VER_MINOR(jesd->version),
@@ -1311,41 +1347,6 @@ static int axi_jesd204_rx_probe(struct platform_device *pdev)
 		 jdev ? ", jesd204-fsm" : "");
 
 	return 0;
-
-err_remove_debugfs:
-	axi_jesd204_rx_create_remove_devattrs(&pdev->dev, jesd, false);
-err_uninit_non_framework:
-	if (!jesd->jdev)
-		of_clk_del_provider(pdev->dev.of_node);
-err_conv2_clk_disable:
-	clk_disable_unprepare(jesd->conv2_clk);
-err_axi_clk_disable:
-	clk_disable_unprepare(jesd->axi_clk);
-
-	return ret;
-}
-
-static int axi_jesd204_rx_remove(struct platform_device *pdev)
-{
-	struct axi_jesd204_rx *jesd = platform_get_drvdata(pdev);
-
-	if (jesd->jdev)
-		jesd204_fsm_stop(jesd->jdev, JESD204_LINKS_ALL);
-
-	axi_jesd204_rx_create_remove_devattrs(&pdev->dev, jesd, false);
-
-	if (!jesd->jdev)
-		of_clk_del_provider(pdev->dev.of_node);
-
-	writel_relaxed(0xff, jesd->base + JESD204_RX_REG_IRQ_PENDING);
-	writel_relaxed(0x00, jesd->base + JESD204_RX_REG_IRQ_ENABLE);
-
-	writel_relaxed(0x1, jesd->base + JESD204_RX_REG_LINK_DISABLE);
-
-	clk_disable_unprepare(jesd->conv2_clk);
-	clk_disable_unprepare(jesd->axi_clk);
-
-	return 0;
 }
 
 static const struct of_device_id axi_jesd204_rx_of_match[] = {
@@ -1357,7 +1358,6 @@ MODULE_DEVICE_TABLE(of, axi_jesd204_rx_of_match);
 
 static struct platform_driver axi_jesd204_rx_driver = {
 	.probe = axi_jesd204_rx_probe,
-	.remove = axi_jesd204_rx_remove,
 	.driver = {
 		.name = "axi-jesd204-rx",
 		.of_match_table = axi_jesd204_rx_of_match,