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: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index c1b8bb09c2211baad1165810a9acee32916586e8..d4d71e60da1b20105a02972dddc35789cc040352 100644 (file)
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -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);
-       if (ret)
-               return ERR_PTR(ret);
+       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;
 }