Skip to content

Commit

Permalink
dmaengine: edma: Merge the of parsing functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Ujfalusi authored and Vinod Koul committed Oct 27, 2015
1 parent 56c7b74 commit 966a87b
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions drivers/dma/edma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 966a87b

Please sign in to comment.