Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

dmaengine: edma: Merge the of parsing functions

Browse Source 
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>
This commit is contained in:
Peter Ujfalusi 2015-10-16 10:18:07 +03:00 committed by Vinod Koul
parent 56c7b74996
commit 966a87b596
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/dma/edma.c
View File

@ -1921,31 +1921,23 @@ static int edma_xbar_event_map(struct device *dev, struct edma_soc_info *pdata,
return 0; 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) static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev)
{ {
struct edma_soc_info *info; struct edma_soc_info *info;
struct property *prop;
size_t sz;
int ret; int ret;
info = devm_kzalloc(dev, sizeof(struct edma_soc_info), GFP_KERNEL); info = devm_kzalloc(dev, sizeof(struct edma_soc_info), GFP_KERNEL);
if (!info) if (!info)
return ERR_PTR(-ENOMEM); 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 (ret) if (prop) {
return ERR_PTR(ret); ret = edma_xbar_event_map(dev, info, sz);
if (ret)
return ERR_PTR(ret);
}
return info; return info;
} }