Commit 06b6e88c authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Vinod Koul
Browse files

dmaengine: axi-dmac: wrap entire dt parse in a function 



All these attributes will be read from registers in newer core versions, so
just wrap the logic into a function.

Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20200825151950.57605-5-alexandru.ardelean@analog.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 08b36dba

drivers/dma/dma-axi-dmac.c

+24 −16
Original line number Diff line number Diff line
@@ -774,6 +774,28 @@ static int axi_dmac_parse_chan_dt(struct device_node *of_chan, 
	return 0;

}



static int axi_dmac_parse_dt(struct device *dev, struct axi_dmac *dmac)

{

	struct device_node *of_channels, *of_chan;

	int ret;



	of_channels = of_get_child_by_name(dev->of_node, "adi,channels");

	if (of_channels == NULL)

		return -ENODEV;



	for_each_child_of_node(of_channels, of_chan) {

		ret = axi_dmac_parse_chan_dt(of_chan, &dmac->chan);

		if (ret) {

			of_node_put(of_chan);

			of_node_put(of_channels);

			return -EINVAL;

		}

	}

	of_node_put(of_channels);



	return 0;

}



static int axi_dmac_detect_caps(struct axi_dmac *dmac, unsigned int version)

{

	struct axi_dmac_chan *chan = &dmac->chan;
@@ -823,7 +845,6 @@ static int axi_dmac_detect_caps(struct axi_dmac *dmac, unsigned int version) 


static int axi_dmac_probe(struct platform_device *pdev)

{

	struct device_node *of_channels, *of_chan;

	struct dma_device *dma_dev;

	struct axi_dmac *dmac;

	struct resource *res;
@@ -854,22 +875,9 @@ static int axi_dmac_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	of_channels = of_get_child_by_name(pdev->dev.of_node, "adi,channels");

	if (of_channels == NULL) {

		ret = -ENODEV;

		goto err_clk_disable;

	}



	for_each_child_of_node(of_channels, of_chan) {

		ret = axi_dmac_parse_chan_dt(of_chan, &dmac->chan);

		if (ret) {

			of_node_put(of_chan);

			of_node_put(of_channels);

			ret = -EINVAL;

	ret = axi_dmac_parse_dt(&pdev->dev, dmac);

	if (ret < 0)

		goto err_clk_disable;

		}

	}

	of_node_put(of_channels);



	INIT_LIST_HEAD(&dmac->chan.active_descs);