From patchwork Fri Aug 21 11:48: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: 7051391 Return-Path: X-Original-To: patchwork-dmaengine@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 29CCEC05AC for ; Fri, 21 Aug 2015 11:48:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4575D2038D for ; Fri, 21 Aug 2015 11:48:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4914020643 for ; Fri, 21 Aug 2015 11:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752704AbbHULsm (ORCPT ); Fri, 21 Aug 2015 07:48:42 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:45251 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752604AbbHULsl (ORCPT ); Fri, 21 Aug 2015 07:48:41 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 21 Aug 2015 20:48:40 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 5098554934; Fri, 21 Aug 2015 20:48:40 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 31BF01806F; Fri, 21 Aug 2015 20:48:40 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 1F2821800A; Fri, 21 Aug 2015 20:48:40 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id WAA21678; Fri, 21 Aug 2015 20:48:40 +0900 X-IronPort-AV: E=Sophos;i="5.15,721,1432566000"; d="scan'";a="192846519" Received: from mail-pu1apc01lp0018.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.18]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 21 Aug 2015 20:48: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 HK2PR06MB0594.apcprd06.prod.outlook.com (10.161.187.145) with Microsoft SMTP Server (TLS) id 15.1.231.21; Fri, 21 Aug 2015 11:48:37 +0000 Message-ID: <87bne0lvbe.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 1/2] 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: Vinod Koul , Mark Brown CC: Dan Williams , , , Linux-ALSA , Liam Girdwood , Simon In-Reply-To: <87d1yglvcy.wl%kuninori.morimoto.gx@renesas.com> References: <87wpwpurzk.wl%kuninori.morimoto.gx@renesas.com> <20150821082636.GK13546@localhost> <87d1yglvcy.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 21 Aug 2015 11:48:37 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0043.jpnprd01.prod.outlook.com (25.164.162.153) To HK2PR06MB0594.apcprd06.prod.outlook.com (25.161.187.145) X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 2:lraSJof7jKN8r3PyN96LVTnMF3W1i5uRdSkeI01fKIarR+t6lZLxH3i0gLBXredOrwNQnXyHp3gbLUeaPQ5cblm7mvbKQqnakICvjFukYphBurit1XjwXVnoAZerSEFFzxKOAROUyWtvKWNUGQVhEu8n+gxp/GNJ/sqoRUNUFuo=; 3:O4H/kcBbuLJveQNXen+ZZNibUrdHbx2wfSqiMfKhrt5101mx+jauuhCVhdr53iyVeJshBgAsVlwrE8imD7m/dgKdYS5N0KSXHrhPjma/iPURBjJ0gfm8kP4fHvTwWLlUtqM6B5fk7N75ulgnPBg5kw==; 25:xsbEjJ7MeCW7+JW+8Z4zkBL2Ex5TmkYSlB2mqImEYeIQTAZSfyni97M5aJ4fGfeEGg7RJCxvqGBmG+lantluAkCWdAlXiuTyc1JT4NM773kgGXgKDwruxsCUYJEGcAvf23b/ux+9mX2OncopJCwomw6K0qD57mMvKNrI2uz8/9n3sRmcqIG2E0tDVZ31zo7eTMJnpLnSHNO1GChIWJp9TNDrLNOTXoteokAXYGx2u1rLU034rg0QT63sEm5uG5xPwI3DqEmVc5bBcEaMUomQEg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB0594; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 20:VOqQmYUYH8VCbXSEpRXZdRvOHjFIbN9kpDBuqSAbLHbzXpqNjYg7kVzdRGN3EoXWbZfF9T1L+8ODG0Am046sGFjFazFNRne31CVfOKTIsBE9zLWXdWdjJcY4yRB4S9RyVsU8SQTem5k9hF72WlLsQIl8FONZ/Oba/v1SvAgHHfsOo7D0SEaI/yl21TCKHhg+m7IJlGTaT2StGt18wTweVatrjKRCxywCUlUalcaeMky6BdpIuOK14+uMIcTCKStKRGzRWKTKDEI4/m0ZsHfTK/OZugN59+R2RvcnJXZ4lu7WnIMGLjVpLVER3jDr/R3lPu9VxtWt0L9f7Y3tzEFJoDoUbgTy9nNNOvE0JS+SfsBbfoBXzl+6CwmQJFCwFWi/9UchVtE214Uco/5c4fyc1PeRs6jr94u8s9c+MzBAEcAmXPJJpK7eGuvlvkDwUfU6hdESOh1NYZW0FLGhu05T7AzKPu8WJF4C+gpIHkZJ729DcCEnqcVEvCHbtpZGlzRW; 4:aGGLOz2CmMgbCSRDzqqKYAB321cxuPxP1cA2VTc3Jj9kwbVTASHLBxoBjOKapSaM8sQNHxtQu7heelPtYAYsAqN/39azN8gILeZEvemzOtLuSJf4HNUZdN6+bKf2zy/0bC/NWF1idW63wN0vLci8MVNn0l1NeIGfedHh11f1wF5MaW3+OB7rzpyJyyqEbNdy6II7zO+WyNTVKIdkf5ITjLXPHZX0nXQwUUBKPO3OpiWOmw1dwBN67kXWNPdyxV5JY6/kVxHjNZRcRXG9EHK2yUP8AhGi9SsPstHnljE3TyfLR1hfdWHP6RqG3xvV+fJg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:HK2PR06MB0594; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB0594; X-Forefront-PRVS: 067553F396 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(40100003)(122386002)(19580405001)(69596002)(5007970100001)(77096005)(46406003)(86362001)(68736005)(66066001)(87976001)(19580395003)(97736004)(4001350100001)(5001770100001)(4001540100001)(53416004)(81156007)(101416001)(46102003)(33646002)(64706001)(50466002)(83506001)(5001960100002)(23726002)(92566002)(50986999)(42186005)(106356001)(47776003)(5001920100001)(189998001)(62966003)(77156002)(105586002)(5001830100001)(5001860100001)(54356999)(36756003)(76176999)(5004730100002)(2950100001)(229853001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB0594; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR06MB0594; 23:dh1Nf1QZfOTozZPTDy3KSRYnqV2zN3LzpcGE4k3y/?= =?us-ascii?Q?5W9ArPSzwxtf4dxGcsMcRCYpG8xUmsMFcb2nEhuIOV/yWCKZpzzgf0FD08dT?= =?us-ascii?Q?XYAduvkLFe9en+fA+dFshjbXStqf0UnVXmW2xp4l9EFJy7HboOA+HEJr8zzL?= =?us-ascii?Q?z0DviQW7JQrLmxdT/e+JkeivvRo4+l+D6xR8YItu5RysL5qLarKZQ5//qc3A?= =?us-ascii?Q?Pe8DuCm9JhyvTc8JlxTVu58CwVWhdmMqRQHlQWap+nQER8Oxgkp0nidnl+wV?= =?us-ascii?Q?doIxHvaZ1PXGnnPfW4WdAv/Fdine9x64g+5EKfBKOvuKmSd6NlWyp+/CZXNu?= =?us-ascii?Q?oV0dZCdayx0lZJkL815f7tobmwC9UxJTTjioWLHNtbtIpDsfhY0FTOqlYrnQ?= =?us-ascii?Q?/Oku6+GY93Q1DLW/ir7lJ1zp1Pr4GxQ631z50/n2EQJwEJbkpVU1orSSYmJb?= =?us-ascii?Q?HQengJOgqMvOU8WCnJzeKFxX9I3sYr2/FUuZF0v+VhemQUb3k+7BCEivYL69?= =?us-ascii?Q?9qeU0vayD45w0c3eUE7ZudiudQvNtWJYtHLA2+9UE+bnej1BLIuWcLSY7ATn?= =?us-ascii?Q?3sc8ELy5BkzFHkS/nO8WL77UqYigipRNonGBBlEkacpjuHzzmfaBti7XFRnS?= =?us-ascii?Q?jMnQ5yHYTX+LwFul+QHMWzwObD9Dyfjaa6IPerwaBdY11UzluMwujPZ3BJBz?= =?us-ascii?Q?0ZYymBfMrwUcSH/0BsDt0pggSxd+MbLw8vyRTrbq9lvfLk1uV+J1ZNuhdyEo?= =?us-ascii?Q?e0GgwEyQHL3nhvpRBWVJ7ORGpr6T2Zb9wSlQSJalEumnFX5SjWXPVt2y4GF7?= =?us-ascii?Q?KyDYS4FEPZeUWjOfuLLte9sefFMPVEWn7r5t4RL2y9XaqjEwdWNDDHS3Nbbp?= =?us-ascii?Q?FlKn9WCYT2kodlWe3w3O+gGHiZel5uLXSCjPnDKu1RhIAhqlh/OX3aLPKv8W?= =?us-ascii?Q?YCJSme3twMSnD/4/8dGUuZxQQN+IyVkYoCEj1nJADIQg7FcWH5RvHCkgKia7?= =?us-ascii?Q?+DxDRawlS/HNMm0YILsjcT9lm8obnGWvc1sounxAHdxCBEhyn6znJs4EyS+F?= =?us-ascii?Q?ENmXgjHxPqu0eIvmjWGGgVN0D8MUXGUgYl6/rDU2SWktWkTKpmkg6iftceq4?= =?us-ascii?Q?+Cu6atYxoiomnh16/wNAKH0ApM09TFm7p14hQm8bPOr5660N/+AoMlx7jACx?= =?us-ascii?Q?wvFMgN248dyuZ02/zLfy46ihQ+y4OydnUE0AB6OHQKT2R+ymBYLGDlDlurY+?= =?us-ascii?Q?k8jQq2J3cIBjgLt9QjCwYR7lu4w1IT8oQ/8FBfN4V9tm8KX2ml/3Ocp6ohK5?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 5:a5S4Cc+wBbpfVCy1pn88X7O4739rEUdWNqva30pN5Ihq8UZ3NCBwCyFpYLHocSLP5sGu3z8AJsVaIbOv4l6EB359PvqkmgBI2WkPBtQbWo/BanE2HiaVtQTT4+pOfbuxgGtWfHf8MLELLjp1sNWlVg==; 24:iNbKXvoWTosfrQ9dfttm3UBxF56TVAluq51/LT2NwqrIE1Rau9z+977OPpThTXKVvzwYkP9DxXb2nG4yJGvR1ssKdMIz/7KbXMmcSaywz9o=; 20:j6ZAIR6Q+8VnhWCtFfkkL62Jf32GC5286fH4YwYIa5ZSpouCbGBcikkXAJj84OkxtI57Rq3CJzN29c8yictZi5W7qfR4YZhr+socNygd0poj+zcgfAP0WjPAedNhOKB819D1oWMLo59IJdGYTWG4j7GgDrjR9nWpxxy94Aoqz9A= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2015 11:48:37.7477 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB0594 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 --- 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 *),