From patchwork Wed Jan 30 07:00:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 2065641 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 EC9DF3FD2B for ; Wed, 30 Jan 2013 07:00:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753868Ab3A3HA0 (ORCPT ); Wed, 30 Jan 2013 02:00:26 -0500 Received: from mail-ia0-f175.google.com ([209.85.210.175]:40851 "EHLO mail-ia0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753727Ab3A3HAW (ORCPT ); Wed, 30 Jan 2013 02:00:22 -0500 Received: by mail-ia0-f175.google.com with SMTP id r4so1816224iaj.6 for ; Tue, 29 Jan 2013 23:00:21 -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=kvnFLt66aUHB2X461ZOmQJA+ahdIa+ggwAKPvi15UY8=; b=wOoYKC6FiVRi+xF12WgWalePG+2Vp5jd7lYmsstTaPzMDazLijIFU+RPJnWMGRd/ua ixdeyV3sucP/ufmxIPwtVpBw9atZM/PUeXsVMUq8CiuuQR6+SbD4/yY8jV9CFU7neirD 8zllKviKQKx+5hJY3p+TrtjMn5ZVmYYyQ+heDrK3/BTUTfb3a8QnV80eNoFopOXp0WQS LVFWppG1eu6UNRcWD50uAauylfhi0hOIkEmZ4+LggzUIgrIdr6A6NtvUV3hGO0iqgxwr CqUG+HFYg8pz6xKQjZqROHFpaw6NCOw5sJD6VQARdoGLKUJLM+00s1GHS7kaRjwqI9j8 rRLQ== X-Received: by 10.50.7.135 with SMTP id j7mr3067252iga.82.1359529221408; Tue, 29 Jan 2013 23:00:21 -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 nj1sm762015igc.3.2013.01.29.23.00.19 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Jan 2013 23:00:21 -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 v6 07/10] dmaengine: add dma_request_slave_channel_compat() Date: Wed, 30 Jan 2013 02:00:26 -0500 Message-Id: <1359529229-22207-8-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359529229-22207-1-git-send-email-mporter@ti.com> References: <1359529229-22207-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 Acked-by: Arnd Bergmann --- include/linux/dmaengine.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index bfcdecb..17d8ffd 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1001,6 +1001,22 @@ 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) +#define dma_request_slave_channel_compat(mask, x, y, dev, name) \ + __dma_request_slave_channel_compat(&(mask), x, y, dev, name) + +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) +{ + struct dma_chan *chan; + + chan = dma_request_slave_channel(dev, name); + if (chan) + return chan; + + return __dma_request_channel(mask, fn, fn_param); +} /* --- Helper iov-locking functions --- */