From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964850Ab3CZOyg (ORCPT ); Tue, 26 Mar 2013 10:54:36 -0400 Received: from mga01.intel.com ([192.55.52.88]:32838 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964797Ab3CZOyT (ORCPT ); Tue, 26 Mar 2013 10:54:19 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,911,1355126400"; d="scan'208";a="312126552" From: Andy Shevchenko To: Vinod Koul , Arnd Bergmann , Viresh Kumar , linux-kernel@vger.kernel.org, spear-devel Cc: Andy Shevchenko Subject: [PATCH v2 3/4] dw_dmac: make wrapper on of_dma_controller_register() Date: Tue, 26 Mar 2013 16:53:56 +0200 Message-Id: <1364309637-25860-4-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 1.8.2.rc0.22.gb3600c3 In-Reply-To: <1364309637-25860-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1364309637-25860-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch introduces new method dw_dma_of_controller_register() and adds checks of the of_node presence together with CONFIG_OF before calling the wrapper. It helps to distinguish the real -ENODEV return code of fake one when of_dma_controller_register is not implemented. Signed-off-by: Andy Shevchenko --- drivers/dma/dw_dmac.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 274fd7d..c1f017b 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c @@ -1303,6 +1303,16 @@ static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec, return dma_request_channel(cap, dw_dma_of_filter, &fargs); } +static void dw_dma_of_controller_register(struct dw_dma *dw) +{ + struct device *dev = dw->dma.dev; + int err; + + err = of_dma_controller_register(dev->of_node, dw_dma_of_xlate, dw); + if (err) + dev_err(dev, "could not register of_dma_controller\n"); +} + /* --------------------- Cyclic DMA API extensions -------------------- */ /** @@ -1843,13 +1853,8 @@ static int dw_probe(struct platform_device *pdev) dma_async_device_register(&dw->dma); - if (pdev->dev.of_node) { - err = of_dma_controller_register(pdev->dev.of_node, - dw_dma_of_xlate, dw); - if (err && err != -ENODEV) - dev_err(&pdev->dev, - "could not register of_dma_controller\n"); - } + if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) + dw_dma_of_controller_register(dw); return 0; } -- 1.8.2.rc0.22.gb3600c3