From patchwork Fri Sep 18 01:58:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7212401 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1694CBEEC1 for ; Fri, 18 Sep 2015 01:58:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37EF1206B5 for ; Fri, 18 Sep 2015 01:58:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 587032062E for ; Fri, 18 Sep 2015 01:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752415AbbIRB6m (ORCPT ); Thu, 17 Sep 2015 21:58:42 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:31222 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752043AbbIRB6l (ORCPT ); Thu, 17 Sep 2015 21:58:41 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2015 10:58:39 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id E18774064D; Fri, 18 Sep 2015 10:58:39 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id B6184480A3; Fri, 18 Sep 2015 10:58:39 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 72841480A4; Fri, 18 Sep 2015 10:58:39 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id LAN28440; Fri, 18 Sep 2015 10:58:39 +0900 X-IronPort-AV: E=Sophos;i="5.17,550,1437404400"; d="scan'";a="195904465" Received: from mail-hk2apc01lp0216.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.216]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 18 Sep 2015 10:58:38 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB0603.apcprd06.prod.outlook.com (10.161.10.153) with Microsoft SMTP Server (TLS) id 15.1.268.17; Fri, 18 Sep 2015 01:58:37 +0000 Message-ID: <87h9ms1ohd.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 1/1 v3] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Simon CC: Magnus , Linux-SH In-Reply-To: <87io781oim.wl%kuninori.morimoto.gx@renesas.com> References: <87twqs1osz.wl%kuninori.morimoto.gx@renesas.com> <87io781oim.wl%kuninori.morimoto.gx@renesas.com> Date: Fri, 18 Sep 2015 01:58:37 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0002.apcprd06.prod.outlook.com (25.164.91.12) To SG2PR06MB0603.apcprd06.prod.outlook.com (25.161.10.153) X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0603; 2:7SsipFlFBdjvev1QaRZRh9qjw0r2dtCMzDS4JbUH1Mdnmx4UfjQl4oHHpPtUWIcDk4f74qikz490skbGYOchAibTLZ2XVd26/l66xM3bBBixldCMkXyIaHZZsL/XhRP0ieCYkgCbZOO4vJP6GC5MgsqEJ//MIeYlfIO7RORshoY=; 3:Z41ZIA4ibo1VZCkscGz9nsNo/gGARHdCWhXqK/HovlBm8MVPAzVqlyo8t9AoA/ve/Ij+i/PNlJSl6kr4B/+P2KpXnoVKtms+w7qZiLwvM1Obq6lIrFuivCX+g0kjaNcv+PVshUHvH9v9ocYp48virA==; 25:aIr3Yb+SvwpaRaP1wLTjVTuG+u+cV4zCMEJTKwTbAxx85Wx2Gj6SnLx1cej/bZQ81gk6Dc3feDjT9zZdOYUojvqh3xv48ScSIda9EKhDTkFybBKt6xedB+iIYcVhZ5H2mnqyxp9SCb5h4+PEjQ9UcASMIp18ULa4zYKYCRCXbc3au0qk7qZyWlI27FhdYA11VSmVfPvcc4xGAtfgVnSRHCJ5UGTZz5NgcZcE7afBPxFQFFsMiDbzU0yWxpr8EtIEieD3Vc1bbIKVXKo3T+yagg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB0603; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0603; 20:NyRiIpd89aT9eMoyxqteJLpuUBfl4phi5CfdHEvHKz4btVXXWV0WpEMlB/SAsJDHMXw0U6GVc8ggCf+n8uOqqBUmGUg8u/D57HoN/DeTRTh/LBO0EdYLFT8uY+UwDcgaeEBLP7B7fzqR6kuQC6TvlO/tA2Rgzo43i06dgcjK94EKHQQYCpC9tOkooeXDjbBf/l8QIkfY0QTT36c6gxQ1QvWGVXuSIlGzp0AthVGpLrRWtUH4DRIAYzPvd21HLp6Sl0VWy1dhgLYwvxfKAyNqXaR+nGMPWc5CawLfJBWjyNZvWPkw7rmXJV1v1+dWaXVUKO8K9HF6y+TJ2mi/4YivmMWIC7lS0Hfa1ink+UFnwk9jE4KKyPIOMBooiQCyaOfI1Sb1WZx6DXvxXY7CShASuPz6HBtBKFOGgoHXT1gCM1NK1b7Imu6PwP/bPt9uNSDB+/kDE90yzrNDoUFVkyWyv+eWNB0RS+ObZrtUsgx+ytqgHGfr5lXk/MBSKbFWCLX/; 4:+HZU/M/rCvlX59C1eJY4+xfPXuhKP9tZB95oXT/fBtrkC7EVfmj0C6CtQdsJLbBCdBXnJ+tNk02jFahPU+o2w1SE4ql5eIXaBqQ5X7pXdZC7HeUQ2rICP5WngNUfgQLHau9sxTRy164TW542gb8wQWFIyw5e8uXy76aP89rY64PNWiaO769MNDvLr6ZGFF2zmA2YaTWCEZELujnMH46hcOeFKxBBuwn1OQmwR72cpU1XI9q2EXBvv6VDyIe03vLSLHFo54KBn/eRhN6wBjAJ2JUlykwD6K5f28HNwBQ8K3nFDR0fs+998DKLoH5iZeZU+nBiqJ1AxQiB78Hb5IL2/wyoBaj4oPMpCDGSZMH7NT4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(520078)(520075)(3002001); SRVR:SG2PR06MB0603; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0603; X-Forefront-PRVS: 0703B549E4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(54356999)(87976001)(2950100001)(83506001)(101416001)(50986999)(46102003)(69596002)(19580405001)(105586002)(86362001)(229853001)(46406003)(5004730100002)(77156002)(76176999)(4001350100001)(62966003)(19580395003)(50466002)(4001540100001)(97736004)(33646002)(110136002)(66066001)(122386002)(68736005)(106356001)(40100003)(53416004)(42186005)(47776003)(92566002)(36756003)(5001830100001)(189998001)(5007970100001)(64706001)(77096005)(81156007)(5001960100002)(5001860100001)(23726002); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0603; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0603; 23:YMMp2m7G/JrZKl1dRvo2QDaij9tNkIqqxiXwRgrbC?= =?us-ascii?Q?EOFso7bHtMaNYN9DMAF5xbgnpzP2zy+vmebW8ZCl+yqZ/5g4g4lxG8eMQrk9?= =?us-ascii?Q?QcAkSPYiP3g8n+DlPi6W24UYteBb/W3wkteRvYD00eSBtzk6yLryU6sl5aTU?= =?us-ascii?Q?3MC0OI33fwCb41HLZ9vhkHFN4A3h4xG7Xr+b4k3COXwmjcZCxX4XPc7hPkH9?= =?us-ascii?Q?7dwqKZCzG0q+Bvr5rkYt+StwZLre8ic7Fd5HVmt/vQNTA9BB6N6Y5bkgbGFX?= =?us-ascii?Q?rKESzqqAPT5CX1eaKAgNpf1YwNT9ojZCziqOibYhEht9j+mlU5hRvtrrCkmG?= =?us-ascii?Q?C6oIMyiPIBly1/imwYCz9+u0FA3BJXHxZVhcWMk6o3vva/X4JrOR1Lrm6zQ9?= =?us-ascii?Q?or5GHjYZeFBO/zYYs6pkQk83dXS7+eCtuZLA6K6ybP3M3b3rOrqK6UkDKVoX?= =?us-ascii?Q?0Kxl+5HgqXspl758V8pN+Ka1D1Kp+F0OdpcQj4eUKU0oIk8CkuihWSd8Qifp?= =?us-ascii?Q?q2OX5gP+no41PwkQWdnSZ8fzdkXOEVEz3/i3kJIJbmMpwFMgjeGQV2Wd3xpq?= =?us-ascii?Q?C+rQTkwYkOqybC4ycYI94ctoo+EHOunWG7gEpL6Nhjn2uT0ZOQiMKOtnUao9?= =?us-ascii?Q?wmhBaAc/uOF+zRh+uHQCsbiPss/yKyXSloMdE+WG2/xjOXyNvOMIPAwyOT5i?= =?us-ascii?Q?tohhN7XRYn9omRXe+Fsu29sYC2yFIjJqwCccPhuuBpCC1JRO+xPcu6iLW4iJ?= =?us-ascii?Q?fOHALgaq2KA2gBR57BlBlcQmakr1eHpDsbVCh4+Vk8qOhPrPMd6KrY0yE5Vr?= =?us-ascii?Q?YBVDv4gdsEyaUhJ6mjqeqVwDAXcpzxan//0AnaV/ntS49wRLfbWL5uBwiW/F?= =?us-ascii?Q?x3pd2nPJi8lNOMXbjzjBQGxOvYjAAPE0ApWjV3cEDzI15pyw3A5LSluP/sUy?= =?us-ascii?Q?+OOFy1wvbm+HRQN5fqfooLFxGQu7QnH53yA8egKxRjY5Kt5feNBB7fM0We8I?= =?us-ascii?Q?vESEaYI3m1qDv/hnM1sgTt2YTHu4133xRXGBvxoUrbYGv2v5SWthww1LCrCL?= =?us-ascii?Q?9VXUNK1NqDfSEoDU/iEq82rtm6/o/2kE0PxtcL+wI1Ua9MarnobldqXbSF1z?= =?us-ascii?Q?iVdgbUd7KJTroEgN5D9rprAaCDHolEA0BENNAzD9scYp9xYwS9E2/+ilYNJB?= =?us-ascii?Q?u323ctTemYF75uz+5D0vR7AP3pgSJGHkz8G2soHpOFqo6kV9nErVdDXE3QbJ?= =?us-ascii?Q?ClpAw84lLn4ASGT3Kw=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0603; 5:37LvE7WruPV2X9Z1Or5oMU3yaCm8GGypf439hoB6Ry4n0xcEY2p0xMr1bXMMaPrEbysjugrYdFx4bIMaq2y390TkjdTswdjeHhuxbI2T7LDqhYpDpdwuAtDOC0ajtK2eyZy51VcvVzPiEJ2os1oWEA==; 24:xxt0C0NM+mJeTstCjftxqUK3/Os2ng6ESkkLfNCtdLnzO/D1uo4dscQgebl8fJAdRzf32qYO9b6ZC9wgUtUHJXRFBOElzSRl0njFiO5GmN8=; 20:X1fhC1CdyDxyOei5J8xJ27TgFSuBoxWu+v9ySnYLrnzg8llreCq1ShVNEDZLIuIs1tD/sm5FbScb5cbtfLPagQO/pS6+wrLdhE0WBJHSrJr+h0NTfRHWBL3IxspQMki1Xt3gSUR+TzCRpNabl5Vsu3BfqDvjkBAFLw1Z3C15wAQ= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2015 01:58:37.2419 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0603 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto 5fa422c ("dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c") moved OF base DMAEngine code to of-dma.c, then it based on CONFIG_DMA_OF. But, OF base DMAEngine API on of_dma.h still based on CONFIG_OF now. So, current kernel can't find OF base DMAEngine API if .config has CONFIG_OF, but not have CONFIG_DMA_OF. This patch tidyup it. Signed-off-by: Kuninori Morimoto --- v2 -> v3 - no change include/linux/of_dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h index 98ba752..36112cd 100644 --- a/include/linux/of_dma.h +++ b/include/linux/of_dma.h @@ -34,7 +34,7 @@ struct of_dma_filter_info { dma_filter_fn filter_fn; }; -#ifdef CONFIG_OF +#ifdef CONFIG_DMA_OF extern int of_dma_controller_register(struct device_node *np, struct dma_chan *(*of_dma_xlate) (struct of_phandle_args *, struct of_dma *),