From patchwork Thu Sep 17 04:21:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7201811 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 46AEA9F380 for ; Thu, 17 Sep 2015 04:21:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5E676208F5 for ; Thu, 17 Sep 2015 04:21:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 363B1208F4 for ; Thu, 17 Sep 2015 04:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751385AbbIQEVh (ORCPT ); Thu, 17 Sep 2015 00:21:37 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:56620 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751375AbbIQEVh (ORCPT ); Thu, 17 Sep 2015 00:21:37 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 17 Sep 2015 13:21:35 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id D5D375072F; Thu, 17 Sep 2015 13:21:35 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id C2B8D480A3; Thu, 17 Sep 2015 13:21:35 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id B57CF48014; Thu, 17 Sep 2015 13:21:35 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id PAK20373; Thu, 17 Sep 2015 13:21:35 +0900 X-IronPort-AV: E=Sophos;i="5.17,543,1437404400"; d="scan'";a="194624353" Received: from mail-sg2apc01lp0245.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.245]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 17 Sep 2015 13:21:34 +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 HKXPR06MB0600.apcprd06.prod.outlook.com (10.161.181.149) with Microsoft SMTP Server (TLS) id 15.1.262.15; Thu, 17 Sep 2015 04:21:33 +0000 Message-ID: <87r3lx7k8g.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 03/20 v2] 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 To: Simon , Magnus , Linux-SH In-Reply-To: <87vbb97kci.wl%kuninori.morimoto.gx@renesas.com> References: <87vbb97kci.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 17 Sep 2015 04:21:33 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0023.jpnprd01.prod.outlook.com (25.161.225.161) To HKXPR06MB0600.apcprd06.prod.outlook.com (25.161.181.149) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0600; 2:467crLfII52unAHaMM+xnj9PQ14+AABtS5hnuhskztJYG/mEIDzuhnk8I7CtInsMoryFwIIZgj6hoEKBj0LoqgT5yDL2T/pAyEMWgPsRB6Gj7ejtb6KyshEQBDhgoAPIvtc07hhBBM+pMjssAK2vBns1Jd8q6402mv7j5DC2u6E=; 3:inUV2OVJRiXFA90SSeoa0eQgkxmjDg3howvHrIKaK2NrMvX+Th+MseholkcRnH0nqzLNBrkj1UHCYGm8d7w8HOGC3+DLAxbl7JCpzk4pCgLNNb1gTW1nei1NardHsxF6zmp2x8Ogt8jfP8eRY5QcMg==; 25:gMitkUtRC+/JqHbfM1g4Sw5zIt2dPiKogIOI1j4UVQHLCeKj2XScSBNiWTgbsFctuW+r5CLirFCAMnBhINE/YF9AU4fPK5l9GJxc4aPs8z36W0xyryJ/KIyhjFecdZeP1LHBXFgTNA61qIy4+R6y49V16ErH6Vo2lYeAffqv3YidKEViMfqRcqrKACli2B1xrCcvLTKyEd/t8RlhzxhnXjsMS8z/3xnfkDLTZrt588JEd2aZDX/Do8P19ZC2tvvBhEWLQ9R59X+haim2Fn2r3g== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB0600; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0600; 20:sNbYNmequ7bQ5DHRo+Hcp09TtTPPbhFBreCNyyLnviF76DhJ+y+pO4yx0jnq52Tw1ViacZT5FMTuO9ZSvepylqsF3YHdungaPpwl5iBzFKT1E4TT7s8yipsilFSoN4XmmKn3TSU2N4r7HBMWTrbup1rG0wFMORQhikl1rdjwL1velooGWyAOgC6PujMq0NrWLUneHWStpS8D1FOr3jELsSG2DD4arRw9WT4J6QKTbyv0hS/TQn6OKoOFNx+wAV/qquMps2KFMR+zeOAbtCJtL6e0rdVqWpZ0+5dimEKSkX2GkqusYw3mi/b2m9S2jroBJTMceGaYAOQwYo9fnKpeb+iq4evHojsMGh2YY5AYCSubdf+nLuO/jxfRwXSV3npTIJBRByJYWx4EmY4JRpYrLui+rH7KLVIuGCDD/zfHkxm4RWep8YfDxkORCHxDrQwVQZDTvxClIBesMaFr9CyETSEnYPYZa9qkXBmXXPOZcFvK2I8NbeZp5LPyVwyWcAUC; 4:kdwWEpJt5DOXkIaLT1cHgRJDHmnG96u9hSrvhgesU+rNGAUlFgC2YF89ZmAEXmVLadKDqEf/jwDNijm05JGrZheORrhwJK5KZYG9hPgeOGj7VOYlqjCVhTRdkwdGlazYeY+hgbdShezd9JRBbR1zk4wVUTkCbOBTdX7St7Y8yrOR4ncOUKlOqbxUpMkhmkT1ydAbTm258XAhN1S5R3E013Hd03OEd4Sv058FhBEnOz5vEa3zRAFCFETHMAVOo4KcDvrGHeZexXZGCGz2YUmaPPsJVPH0a/QDg07CJ9hofpjXztn+asleyIv+C4WP0Bi3xHU6ZeURe0Yv6ZsYZZhyMjSeoy3nc7Bdza6TGZFsqg5ePTW+lOBC+GqEkMrjEd7m X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520078)(520075)(8121501046)(520058)(5005006)(3002001); SRVR:HKXPR06MB0600; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB0600; X-Forefront-PRVS: 07025866F6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(101416001)(77156002)(87976001)(42186005)(92566002)(50986999)(64706001)(77096005)(36756003)(46102003)(5007970100001)(229853001)(2950100001)(106356001)(23726002)(105586002)(62966003)(122386002)(5004730100002)(83506001)(40100003)(47776003)(19580405001)(19580395003)(81156007)(54356999)(66066001)(69596002)(46406003)(76176999)(107886002)(86362001)(33646002)(4001350100001)(5001960100002)(5001770100001)(5001920100001)(68736005)(5001860100001)(53416004)(97736004)(189998001)(50466002)(5001830100001)(4001540100001); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB0600; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB0600; 23:aKEEoqCgZ/0QtG2TPtFElw4vkD3n9wAmLkkeF8pxE?= =?us-ascii?Q?aXkj+s5/Z9rSyyJY5rj5BNIJpIZzEqUSm9p0zi9UjhamlE3YNnXg+jo6y9aG?= =?us-ascii?Q?jhUonO9MvdxZZk8rQXIMQEsa6+KgnkVm6Kxfjy9MzGEUG7EmSIb9GGkoibwt?= =?us-ascii?Q?/IHieZkDplzfBWfaznj27HkCIDuUtfOecIimN9OmezJ7X8Y9qPzi4w1ETNdp?= =?us-ascii?Q?6O+6RWeOMuLPPSyjoZjrJVTQNGiMUm4N52+gveVt++KSwVFEpja1fwHyrQnt?= =?us-ascii?Q?RfPuF2RPU8Ycn05AJPx8VfXWmvXZkI8cotV4mZ5QT2LoRFltbIrwHXa484JM?= =?us-ascii?Q?n/38p2wyhKM1bnnwt1tQaQNvidYjUXDFPt9sgIFN4QQbQBdBwhb3SIuh5ywv?= =?us-ascii?Q?DoaOcooNDmciNlFOKDb5SYcNRHhhuhJwgKBAS/PMmpyUN4BxaMwL7UI+DOVD?= =?us-ascii?Q?yVg+WakV87u+DN0rYXoZEP5vjSF63mAqk9qVhfrIPBvDAQACFRlz/XnkNI92?= =?us-ascii?Q?OJKzjIIjuwDcqVkW77B6hnW1T0aZez4PUeUxDoqjXeCrzqiATbbywbJ9teRS?= =?us-ascii?Q?52ehmAxXTtj+dMUk8+/w0W3qC9wN08VFDdS33Rs/P2I90EDnM5Ur/Z0Z6cTO?= =?us-ascii?Q?UtVacwY5K695xSOWa1gGnopCvTeRmCN8XEE4CoBwjadOW1E0VHlkVsIpDtNn?= =?us-ascii?Q?xJclQq9YW7I3voJVEAC61jf1avcYnNvvSTccZW5rq8O/KFbF/ce9eBfANTmA?= =?us-ascii?Q?H4CPHqX1qvhsNkjpgF13UsqBkEWkA7Zd44U6DXNwTrstHVwwOq4QVNTAPFDB?= =?us-ascii?Q?Cix840YRMAnVGAj+VfQhsRVlbwLFnz3eUXAYrJSGvGuWe0ut0CB1dp28q29M?= =?us-ascii?Q?OVmJz0y4fZxoL/HUxPMFszqgpaW1uv6r/cyiZm0pN3VnsJE92/bxn+5ujdo+?= =?us-ascii?Q?ugucoR3tIVv0J7rWUV4HoezhN/WfBvF3+3Yr7IXwqgCgbyXVdvCFNxKf/y5M?= =?us-ascii?Q?/JzN51x5EHOk5NtU218vaLDQrphaYUXtggYYHNCSg5sDaC63exXllN8Y/VXP?= =?us-ascii?Q?CUXtLONHbw6LhQgEjjbBIZZI1OZfT/h21doTVfG+Ow4/tgcsfcNWN7a5qtdu?= =?us-ascii?Q?UwxhUeb93pBv84I0FHJ6vEz/kSOEgc5sWKRiX8zTWjvHiOhBGayfM8V66iUx?= =?us-ascii?Q?CBiWPA8igXm8wLPYoaGjFm+xaFlJ5csXMOlvfQkbU5JlZkvbJcRjEkiyOIjp?= =?us-ascii?Q?Oqa1gJ5HOV1OsX68MxwZrVG65cuIA5MfAsT0U7Vlofx2xNQLbDTgHDVfzno6?= =?us-ascii?Q?ZCXgsuM5c2uZGEY/laaQno=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0600; 5:eIFEG13wCKE7DdsT7E6/MVD3NWfqSS1JKB/gnOeGLg3wqMSmSjd4Cum0+Qv4bBJq7XqGdOr7VA7Ne094+ZO9Y16WhgFkg5X4XzywbQIfLucKAXtJpwiihS82jSbc6ngDo9rv1keNippWJGwUBXPWZQ==; 24:QSSOa5eCjtbLsWNK7U/spmKJj8lQUmK1jXWg9QurtVmcGwWVatKBcfLBvpwpUKAnr22T+p46It1L4hkxi9QYcB2ccoPRfgNJKAnnUvbK3Vg=; 20:g6r74ERld1KgK0/xELTgh30X/Ilov/bwVOnZ3dAW9qPe9n9bTdDd5wqHF4cqwQplADXYCSAeX0T8SwuKw1Dxv9pyXC7gtq5FLDLjxbP5YyzByJRLRVj0/6hTc2yD/i/UDAY6/ShX6xy2qmcQhUuxYmh7WMWp1sPMvVBwooYvH0A= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2015 04:21:33.4629 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB0600 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 --- v1 -> v2 - already posted, not yet merged 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 *),