Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 966a87b5 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: edma: Merge the of parsing functions 



Instead of nesting functions just merge them since the resulting function
is still small and readable.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 56c7b749

drivers/dma/edma.c

+8 −16
Original line number Diff line number Diff line
@@ -1921,31 +1921,23 @@ static int edma_xbar_event_map(struct device *dev, struct edma_soc_info *pdata, 
	return 0;

}



static int edma_of_parse_dt(struct device *dev, struct edma_soc_info *pdata)

{

	int ret = 0;

	struct property *prop;

	size_t sz;



	prop = of_find_property(dev->of_node, "ti,edma-xbar-event-map", &sz);

	if (prop)

		ret = edma_xbar_event_map(dev, pdata, sz);



	return ret;

}



static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev)

{

	struct edma_soc_info *info;

	struct property *prop;

	size_t sz;

	int ret;



	info = devm_kzalloc(dev, sizeof(struct edma_soc_info), GFP_KERNEL);

	if (!info)

		return ERR_PTR(-ENOMEM);



	ret = edma_of_parse_dt(dev, info);

	prop = of_find_property(dev->of_node, "ti,edma-xbar-event-map", &sz);

	if (prop) {

		ret = edma_xbar_event_map(dev, info, sz);

		if (ret)

			return ERR_PTR(ret);

	}



	return info;

}