From patchwork Fri Feb 1 18:22:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 2081691 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 243BD40106 for ; Fri, 1 Feb 2013 18:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757328Ab3BASYJ (ORCPT ); Fri, 1 Feb 2013 13:24:09 -0500 Received: from mail-ie0-f170.google.com ([209.85.223.170]:55066 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757046Ab3BASWf (ORCPT ); Fri, 1 Feb 2013 13:22:35 -0500 Received: by mail-ie0-f170.google.com with SMTP id c11so3816439ieb.29 for ; Fri, 01 Feb 2013 10:22:34 -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=6t9BXydIs9bvB3BGVu6x9RwRRW5cUQnT6mPIIv6RMN0=; b=DaJBjPY/IjjvxcIqeNOWzLnJA8Leemchi5zg2PXNxFkGaus1lhYQ8m0i6QL1li0e6A oNkcKuKeHZZFG7vtXtY4XSwQTnoZaH78q9QaSI/BwPIZv67uVEhuyOtxrTJap2OTzqg2 pEHMXFEld2aqOcTqQtkxetQYs+yHvW0dvJAYuvoSOmy+f1orCeMIwDPDr12cS1ZsYUII Kz6w7rCcbwINMWEEPpxOUNyur72V+bltiE5T4IA3kWNqfSalxKoZYLNWYpvHHm6pPz5E jXcywNqMyr6y6trE9QZarzYQMrZh08UXFWBuKDctwch4pyMiPgo9YJGRF0r1htU3sok7 yC4w== X-Received: by 10.50.149.196 with SMTP id uc4mr1953160igb.74.1359742953956; Fri, 01 Feb 2013 10:22:33 -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 b13sm3496854igp.7.2013.02.01.10.22.32 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 10:22:33 -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 v7 07/10] dmaengine: add dma_request_slave_channel_compat() Date: Fri, 1 Feb 2013 13:22:52 -0500 Message-Id: <1359742975-10421-8-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359742975-10421-1-git-send-email-mporter@ti.com> References: <1359742975-10421-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 Acked-by: Vinod Koul --- 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 --- */