From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753939AbbJPHVL (ORCPT ); Fri, 16 Oct 2015 03:21:11 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:54972 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753714AbbJPHTN (ORCPT ); Fri, 16 Oct 2015 03:19:13 -0400 From: Peter Ujfalusi To: , CC: , , , , , , Subject: [PATCH v2 09/14] dmaengine: edma: Merge the of parsing functions Date: Fri, 16 Oct 2015 10:18:07 +0300 Message-ID: <1444979892-31626-10-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444979892-31626-1-git-send-email-peter.ujfalusi@ti.com> References: <1444979892-31626-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of nesting functions just merge them since the resulting function is still small and readable. Signed-off-by: Peter Ujfalusi --- drivers/dma/edma.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index c1b8bb09c221..d4d71e60da1b 100644 --- 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; } -- 2.6.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Ujfalusi Subject: [PATCH v2 09/14] dmaengine: edma: Merge the of parsing functions Date: Fri, 16 Oct 2015 10:18:07 +0300 Message-ID: <1444979892-31626-10-git-send-email-peter.ujfalusi@ti.com> References: <1444979892-31626-1-git-send-email-peter.ujfalusi@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1444979892-31626-1-git-send-email-peter.ujfalusi@ti.com> Sender: linux-kernel-owner@vger.kernel.org To: vinod.koul@intel.com, nsekhar@ti.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, tony@atomide.com, r.schwebel@pengutronix.de List-Id: devicetree@vger.kernel.org Instead of nesting functions just merge them since the resulting function is still small and readable. Signed-off-by: Peter Ujfalusi --- drivers/dma/edma.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index c1b8bb09c221..d4d71e60da1b 100644 --- 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; } -- 2.6.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: peter.ujfalusi@ti.com (Peter Ujfalusi) Date: Fri, 16 Oct 2015 10:18:07 +0300 Subject: [PATCH v2 09/14] dmaengine: edma: Merge the of parsing functions In-Reply-To: <1444979892-31626-1-git-send-email-peter.ujfalusi@ti.com> References: <1444979892-31626-1-git-send-email-peter.ujfalusi@ti.com> Message-ID: <1444979892-31626-10-git-send-email-peter.ujfalusi@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Instead of nesting functions just merge them since the resulting function is still small and readable. Signed-off-by: Peter Ujfalusi --- drivers/dma/edma.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index c1b8bb09c221..d4d71e60da1b 100644 --- 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; } -- 2.6.1