From patchwork Fri Jan 11 05:48:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1963991 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CEA073FF0F for ; Fri, 11 Jan 2013 05:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754920Ab3AKFoj (ORCPT ); Fri, 11 Jan 2013 00:44:39 -0500 Received: from mail-qa0-f46.google.com ([209.85.216.46]:63946 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754479Ab3AKFoh (ORCPT ); Fri, 11 Jan 2013 00:44:37 -0500 Received: by mail-qa0-f46.google.com with SMTP id r4so2323081qaq.19 for ; Thu, 10 Jan 2013 21:44:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=Ijm1SSSrNo/il7YwsohpF4NnTsUmC/iEi3WiX2vhS1o=; b=gatbgDirSsDD6fy5gV2hcLUL8kCmW+pljYr2q77UvXHfqzwvHrDB+Tkvf908LT4iFc bVe18CCVYw+gdllOmtGAnB3nruGkNaS3pVSgV+vRoutR186eWnnu88GXtsVmNtzChoW+ Oqq2TZ/UuaOG2trKNue63G7UNiJfdgHkN/t/xduC1SZ76GYpcfFNtagaa2Z79CeRimka YPvtOlDrgchxL89J46CwEyadkRGVUs3hhoXMQeU80u2bk3FmO1vljTKm5kbOg4rpKIRd dUDDrv2jisQlOzBh/ACABubQlms4MXytD+GyGjEr5JswKFNzMMRC7+eYnHvq89N9NOsu im9Q== X-Received: by 10.49.108.9 with SMTP id hg9mr68698298qeb.34.1357883076029; Thu, 10 Jan 2013 21:44:36 -0800 (PST) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id ds8sm1897114qab.18.2013.01.10.21.44.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jan 2013 21:44:35 -0800 (PST) From: Matt Porter To: Tony Lindgren , Sekhar Nori , Grant Likely , Mark Brown , Benoit Cousson , Russell King , Vinod Koul , Rob Landley , Chris Ball Cc: Devicetree Discuss , Linux OMAP List , Linux ARM Kernel List , Linux DaVinci Kernel List , Linux Kernel Mailing List , Linux Documentation List , Linux MMC List , Linux SPI Devel List , Arnd Bergmann , Dan Williams , Rob Herring Subject: [PATCH v4 07/14] dmaengine: add dma_request_slave_channel_compat() Date: Fri, 11 Jan 2013 00:48:43 -0500 Message-Id: <1357883330-5364-8-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357883330-5364-1-git-send-email-mporter@ti.com> References: <1357883330-5364-1-git-send-email-mporter@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Adds a dma_request_slave_channel_compat() wrapper which accepts both the arguments from dma_request_channel() and dma_request_slave_channel(). Based on whether the driver is instantiated via DT, the appropriate channel request call will be made. This allows for a much cleaner migration of drivers to the dmaengine DT API as platforms continue to be mixed between those that boot using DT and those that do not. Suggested-by: Tony Lindgren Signed-off-by: Matt Porter Acked-by: Tony Lindgren --- include/linux/dmaengine.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 9fd0c5b..64f9f69 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1047,6 +1047,16 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx); struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type); struct dma_chan *net_dma_find_channel(void); #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) +static inline struct dma_chan +*dma_request_slave_channel_compat(dma_cap_mask_t mask, dma_filter_fn fn, + void *fn_param, struct device *dev, + char *name) +{ + if (dev->of_node) + return dma_request_slave_channel(dev, name); + else + return dma_request_channel(mask, fn, fn_param); +} /* --- Helper iov-locking functions --- */