iio: jesd204: axi_jesd204_tx: 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_tx.c

@@ -525,7 +525,6 @@ static int axi_jesd204_register_dummy_clk(struct axi_jesd204_tx *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",
@@ -543,13 +542,11 @@ static int axi_jesd204_register_dummy_clk(struct axi_jesd204_tx *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_tx_pcore_check(struct axi_jesd204_tx *jesd)
@@ -889,6 +886,33 @@ static int axi_jesd204_init_non_framework(struct device *dev,
 	return axi_jesd204_register_dummy_clk(jesd, dev);
 }
 
+static void axi_jesd204_clk_disable(void *clk)
+{
+	clk_disable_unprepare(clk);
+}
+
+static void axi_jesd204_tx_teardown(void *data)
+{
+	struct axi_jesd204_tx *jesd = data;
+
+	writel_relaxed(0xff, jesd->base + JESD204_TX_REG_IRQ_PENDING);
+	writel_relaxed(0x00, jesd->base + JESD204_TX_REG_IRQ_ENABLE);
+	writel_relaxed(0x1, jesd->base + JESD204_TX_REG_LINK_DISABLE);
+}
+
+static void axi_jesd204_tx_rmattr(void *data)
+{
+	struct axi_jesd204_tx *jesd = data;
+
+	device_remove_file(jesd->dev, &dev_attr_status);
+	device_remove_file(jesd->dev, &dev_attr_encoder);
+}
+
+static void axi_jesd204_stop_fsm(void *jdev)
+{
+	jesd204_fsm_stop(jdev, JESD204_LINKS_ALL);
+}
+
 static int axi_jesd204_tx_probe(struct platform_device *pdev)
 {
 	struct axi_jesd204_tx *jesd;
@@ -908,8 +932,6 @@ static int axi_jesd204_tx_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)
@@ -943,7 +965,7 @@ static int axi_jesd204_tx_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);
 
@@ -973,18 +995,19 @@ static int axi_jesd204_tx_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_TX_REG_CONF_NUM_LANES);
@@ -1002,78 +1025,51 @@ static int axi_jesd204_tx_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_tx_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_TX_REG_IRQ_PENDING);
 	writel_relaxed(0x00, jesd->base + JESD204_TX_REG_IRQ_ENABLE);
 
-	ret = request_irq(irq, axi_jesd204_tx_irq, 0, dev_name(&pdev->dev),
-		jesd);
+	ret = devm_request_irq(&pdev->dev, irq, axi_jesd204_tx_irq, 0, dev_name(&pdev->dev), jesd);
 	if (ret)
-		goto err_uninit_non_framework;
+		return ret;
 
 	device_create_file(&pdev->dev, &dev_attr_status);
 	device_create_file(&pdev->dev, &dev_attr_encoder);
 
 	platform_set_drvdata(pdev, jesd);
 
-	ret = jesd204_fsm_start(jesd->jdev, JESD204_LINKS_ALL);
+	ret = devm_add_action_or_reset(&pdev->dev, axi_jesd204_tx_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-TX (%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),
 		 ADI_AXI_PCORE_VER_PATCH(jesd->version), jesd204_encoder_str(jesd->encoder),
 		 jesd->data_path_width, jesd->tpl_data_path_width, jesd->num_lanes,
 		 jdev ? ", jesd204-fsm" : "");
 
-	return 0;
-err_remove_debugfs:
-	device_remove_file(&pdev->dev, &dev_attr_status);
-	device_remove_file(&pdev->dev, &dev_attr_encoder);
-	free_irq(irq, jesd);
-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_tx_remove(struct platform_device *pdev)
-{
-	struct axi_jesd204_tx *jesd = platform_get_drvdata(pdev);
-	int irq = platform_get_irq(pdev, 0);
-
-	if (jesd->jdev)
-		jesd204_fsm_stop(jesd->jdev, JESD204_LINKS_ALL);
-
-	device_remove_file(&pdev->dev, &dev_attr_status);
-	device_remove_file(&pdev->dev, &dev_attr_encoder);
-
-	free_irq(irq, jesd);
-
-	if (!jesd->jdev)
-		of_clk_del_provider(pdev->dev.of_node);
-
-	writel_relaxed(0xff, jesd->base + JESD204_TX_REG_IRQ_PENDING);
-	writel_relaxed(0x00, jesd->base + JESD204_TX_REG_IRQ_ENABLE);
-
-	writel_relaxed(0x1, jesd->base + JESD204_TX_REG_LINK_DISABLE);
-
-	clk_disable_unprepare(jesd->conv2_clk);
-	clk_disable_unprepare(jesd->axi_clk);
-
 	return 0;
 }
 
@@ -1086,7 +1082,6 @@ MODULE_DEVICE_TABLE(of, axi_jesd204_tx_of_match);
 
 static struct platform_driver axi_jesd204_tx_driver = {
 	.probe = axi_jesd204_tx_probe,
-	.remove = axi_jesd204_tx_remove,
 	.driver = {
 		.name = "axi-jesd204-tx",
 		.of_match_table = axi_jesd204_tx_of_match,