From patchwork Fri May 25 15:25:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136942 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3729993lji; Fri, 25 May 2018 08:25:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpew5oNjkxf6qT40LzIR+6U8HP2eYutjKnumWcy69+3earSPgh2PjtqinqjGURZP8yMfnVI X-Received: by 2002:a63:7d47:: with SMTP id m7-v6mr2351581pgn.443.1527261943969; Fri, 25 May 2018 08:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527261943; cv=none; d=google.com; s=arc-20160816; b=KokV2uZETv69SkyNFGdBJDjzrtzCCWqC/VL0RdYVHwc8hTfwSrh++4CZSsu77TSmtS Jf8YHmBdEfGAhDBu7GnIuugqvtbEB+9hkh7dNIuOIhoxwGYQJBzRSKGm+eO67dPopgnr avXq+5hgKGyRJG7VpI5Eo3Ug+La7y94tTqZiHtM/qnHHYluXArV6GyW1itudjCUo0b16 gVPoeWU4kufohK23d8CRK+UgJ83JryfWBVP7/7ZgGFMGQlDOf179vKPp0lqix868pxwW UnfxSa3jFAmx5DBw9wyUNZVw6MmLEjH3eCm072Anc7QdSGi9J0sk/4Z3yeWxVGQwpy3E EB+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=EyQ3Zcay95xHuqonhQSLK3O9RtMoIyRSaOvbLHEYhm8=; b=yju1wfkYIXMUWmcj9isI2So1ndfNkOvR/0QIbUQ0gqHfNF/0RbEwRU+qKk2jxqJJ/r p5Ap1A/yVbszjC/vdVRDR5ZAh5u7MwydcXzD0tulT2s6EwSgF6wPXtw/C99+JiYS+gwJ /5KQxtatO4nJwPdPlwYqjQ9tNvFdn+JUKlRQx2JP3W3ipwxF9KW9jC9DmeTOfkr/LoFa NY17zOxL4rObOYk9mrv3BWHvVF6oMoTGIjggUDKlRlOuciswlXNzOraDnrpUXeg70w1F YhxitHUP7Wi6oHmQTkH91lgtEXqKpgmPZIBUvMn3hbc7pzmKX31boM0Juxsvcm6ZHmVe m9Mg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b9-v6si22434727plb.522.2018.05.25.08.25.43; Fri, 25 May 2018 08:25:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965826AbeEYPZk (ORCPT + 30 others); Fri, 25 May 2018 11:25:40 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:60619 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964823AbeEYPZj (ORCPT ); Fri, 25 May 2018 11:25:39 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MLFy5-1fMVi21xXV-000LPj; Fri, 25 May 2018 17:25:27 +0200 From: Arnd Bergmann To: Laurent Pinchart , Mauro Carvalho Chehab Cc: Arnd Bergmann , Sakari Ailus , Sebastian Reichel , Hans Verkuil , Pavel Machek , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] media: omap3isp: fix warning for !CONFIG_PM Date: Fri, 25 May 2018 17:25:08 +0200 Message-Id: <20180525152523.2821369-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:Z8CaZDK3mNc5lxbRVyWrbs+HRb0VXJKIKd1hniATTuoV+fZf9bP gxihhjX/r2Z9g9UqvAnwjb+hiVRGv3t9d/5uuET19dy23He2nVVgzio/fD7dI3k+0ijBDIh 08FlXjaz3D/eekx1MJ2WgIeIS3ZbUczghcw8ygehQqZif5IF25GxuPt9R4+ancqz9NWeWHk b2X0rJCi/R2CoQ0ul0+FA== X-UI-Out-Filterresults: notjunk:1; V01:K0:U/KhIl74fKM=:CZ3Ig2zZd/JRUdMBfBDWSt xb3ZEfgGs9bqq8LPpGMqF9yrAPB3Oy2FtIcn7pJujNjmRMSI5mpCGo2KEoUu7Bv2Le12bpj6V YgskILbTpuh4mdXILiSjDrDebP+KEyVUXUzU4dO0MFxm18x0zt29wv1i+iIu6W25SGtiLGkZJ BJvR1cTu15qHxa6HTQwX5BJmAbDO6sK5ndB3n2n1jHzTZBhVZRkmkgsIunBm4i/8gSMZmKjO7 DSguNXymfTMvMeIUwsM0WLLJe5G9FdadY1pqhZIZw2ofWcTvaGE7AmjjuJrN4Gke+AdGZeKpg jYBFqO0HVrpV4oXAt7k/Dz/hcsFwvnn1Wo/L5RsWwHcl75XhDfVH2a6QmfenfW2QIR2pY01T9 QbS2fIliF6SaCfLlsEUVWqzdWW1mOA95c2R1IE5/MQKrxeMTM57dGTXrEPFOGyiwqYfYU3j+A Mt2XMk0IWHpFE262SXxM46xa1Gs1UQLYropnPAQ17l4DzR04vHnXNAIet0ScGhgSiKVo7w1md xfVBIoGaaY7AVKRotQvslg9cZyAjbbCIEFFsByx6QDDB/4ZUTGQLmDJ7NILSl1ObV/UnFWVFB ggow2nFuX0ftvBRXxlg/02L690lenju6HJceLLhtmQ7EpbsrMBNb0KCTTGDArVW+0rUE2N2p7 5ZPIMWomRtxruEzIVVkImBNnAQguBA/HDSHSGuKXx8NtOE9K04l45fyF61yPmQdgwEGQ= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The final version of the COMPILE_TEST patch for this driver missed one warning about suspend/resume functions that can now appear on platforms that don't always set CONFIG_PM: drivers/media/platform/omap3isp/isp.c:1008:13: error: 'isp_resume_modules' defined but not used [-Werror=unused-function] static void isp_resume_modules(struct isp_device *isp) ^~~~~~~~~~~~~~~~~~ drivers/media/platform/omap3isp/isp.c:974:12: error: 'isp_suspend_modules' defined but not used [-Werror=unused-function] static int isp_suspend_modules(struct isp_device *isp) This marks the respective functions as __maybe_unused as an easy workaround. Fixes: 243131134be4 ("media: omap3isp: Allow it to build with COMPILE_TEST") Signed-off-by: Arnd Bergmann --- drivers/media/platform/omap3isp/isp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index f22cf351e3ee..a658c12eead1 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -971,7 +971,7 @@ static void isp_resume_module_pipeline(struct media_entity *me) * Returns 0 if suspend left in idle state all the submodules properly, * or returns 1 if a general Reset is required to suspend the submodules. */ -static int isp_suspend_modules(struct isp_device *isp) +static int __maybe_unused isp_suspend_modules(struct isp_device *isp) { unsigned long timeout; @@ -1005,7 +1005,7 @@ static int isp_suspend_modules(struct isp_device *isp) * isp_resume_modules - Resume ISP submodules. * @isp: OMAP3 ISP device */ -static void isp_resume_modules(struct isp_device *isp) +static void __maybe_unused isp_resume_modules(struct isp_device *isp) { omap3isp_stat_resume(&isp->isp_aewb); omap3isp_stat_resume(&isp->isp_af); From patchwork Fri May 25 15:25:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136943 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3730327lji; Fri, 25 May 2018 08:26:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpPElyxC6oDUXWD4II8ggl5zEFwsJSrymfzh/nj1zRXGZUJTT5YsrlK7pGmqWX6WIT9GJkT X-Received: by 2002:a17:902:aa04:: with SMTP id be4-v6mr3107244plb.20.1527261962925; Fri, 25 May 2018 08:26:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527261962; cv=none; d=google.com; s=arc-20160816; b=jlR3Bbu5ylOwW8cYMjl0L/Aa7kb2ns0ezjE5mzW8+pSDfhaNCM7TvIv9yB8tvaDNcR v7RnOu9Tkf5MvXnWXAphs2drndD5lUVYwpYY90U8Yj1HQeodarMeieGCq+TVMHDrysnq 9wyvWmybmUnwkCLmxwd/zdUtqStcfOV7FXZIuTWnCgCMfZAQZLNB0BaeKqoczF4Wv6GU caYKE+K9WdjWiocaVl9imJ69t7kimOlEB9YIhvffXVHzN5WwGeIZLOIM9bmnNEG65mzy UXr82I1lDnrHsxivWqx6BUxrYeRebEJjHGDZdLS6kGDM4oyqwD4eFuEvl12hV7yZJsiH eWvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=RXQRqqHYrbp0q7MX0Wrw8jsLALe1XIdmVOt6ZXs5PFs=; b=ouVk4HOeLcfhvNH5ZSsg41t492Ovj5g2zGTgUyEvnaSO6XoMWUyt1cbP/llms//9jA FWz0hMVY7lPI6Gm46jS5kQlNDCNpb4RqDBARHmY2jL1nW62zaY5tR4JalGJxUREel8pJ hB1Auj7Eias5yMid5p6NR8CL0xgfbrRttY04dVpg2nYamvMTt4HFU+0xYB5AfqRDymew Uao+Sys1ZORjgAtgXC6ODMz8BtvEk54ezWkMJtj2EgC4bGS8vjf1OckxEdepyKDR14bs NS7CxuGB6pBimy0sxSOluHHMcj4i+V6PHG7KM1oL4xFgVKlgO8YIVbtRhnNUrn4go06/ P5hQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n34-v6si23529580pld.91.2018.05.25.08.26.02; Fri, 25 May 2018 08:26:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966431AbeEYP0A (ORCPT + 30 others); Fri, 25 May 2018 11:26:00 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:59181 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964823AbeEYPZ6 (ORCPT ); Fri, 25 May 2018 11:25:58 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MFUge-1faWKW1Vum-00EQJe; Fri, 25 May 2018 17:25:48 +0200 From: Arnd Bergmann To: Maxime Ripard , Mauro Carvalho Chehab Cc: Arnd Bergmann , Sakari Ailus , =?utf-8?q?Niklas_S=C3=B6derlund?= , Benoit Parrot , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] media: v4l: cadence: include linux/slab.h Date: Fri, 25 May 2018 17:25:09 +0200 Message-Id: <20180525152523.2821369-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525152523.2821369-1-arnd@arndb.de> References: <20180525152523.2821369-1-arnd@arndb.de> X-Provags-ID: V03:K1:KI/N2Y1Kr1RwYWjgmmK++++u2SCer5bqrOASvTmTpLUo1rEzEUV CmXmNz7LxljthPWYVB1wByrVUvDBPY7R/BvSqQ61o0NvyAPHx7KLN5o8a/9eb6RZfkoW/hq Gyfss/+znVZ4CnsToMkcz141HnWT2FhOSs5LxNSr/xTFvZYeHfOc0SAVMf8fR/MzEYktbj1 dLuGpwCFsQlkAlOjcOR9A== X-UI-Out-Filterresults: notjunk:1; V01:K0:UHTpZ6O17xo=:iUVVHxCuVEb0OSnXAcpkLV c7HoNxjIFNyf27w7btaFDdPocIPBZwErGPJXqr/sVOY1+ZhS7t4/w4FXo3AxpESEO0uqy1mox A18jeQ7YMLOlZyplQR2PKvZfuo5C+3bIf71JxEzIrmCORjxp/JQi91dQR+PI5WQ9D/F0WXrSg NsJMYBqZin+/S1N98M/oSoa9ewsaMbl0DkNGxh28isXunp/VPmNKLgqJFJR2ztqf/3Oazjgda ak0ycTTcLR+E/CciKTSCZvcRge84iKQb3/ebcpLa6N5J0HrDmpyz3O9WMbwGouO4B06l4CZ01 j7XUtwCTvw4AKbYk8Exlel4cy2y1Vyg9XFHMyO+1OL778xPXrBolni79m3NIz5Vg4sK/v8s6i /+SzbaC9H2UTmHcktWWcaIzUtwHAolw9Uh3RZKedvqTNcfBDEXgnw+Owh64UuYO+ddhRVR4F2 pVYAEiFQkaG/ar4+7E7Wgh0Ry2JU0JtQe5RlOZVhXDFZ2WlM04nOo0svxYnQyAzMLECKyTC44 nmMbBc+OCIsApkQdOOh7KYjLweqBbSWlyXwwQw6jFanSWYsYOp5wwdZLnQ3AdKEU5wRs8gJAF VmrjspdfvpUW99P6evarZXpATpAy8x3mDWfd9JCg2qvQ+FdTn0xxKVfnOSkqAd73lgLGwd0Kg OdQnVZYt4U4gqTfdwxjIW9Zggri5iEDT1qfaM7FAMRnBmowR5ZZBTEyQ+XyGrqHD78EM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I ran into a randconfig build error with the new driver: drivers/media/platform/cadence/cdns-csi2tx.c: In function 'csi2tx_probe': drivers/media/platform/cadence/cdns-csi2tx.c:477:11: error: implicit declaration of function 'kzalloc'; did you mean 'd_alloc'? [-Werror=implicit-function-declaration] kzalloc() is declared in linux/slab.h, so let's include this to make it build in all configurations. Fixes: 84b477e6d4bc ("media: v4l: cadence: Add Cadence MIPI-CSI2 TX driver") Signed-off-by: Arnd Bergmann --- drivers/media/platform/cadence/cdns-csi2rx.c | 1 + drivers/media/platform/cadence/cdns-csi2tx.c | 1 + 2 files changed, 2 insertions(+) -- 2.9.0 Acked-by: Maxime Ripard diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c index a0f02916006b..43e43c7b3e98 100644 --- a/drivers/media/platform/cadence/cdns-csi2rx.c +++ b/drivers/media/platform/cadence/cdns-csi2rx.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include diff --git a/drivers/media/platform/cadence/cdns-csi2tx.c b/drivers/media/platform/cadence/cdns-csi2tx.c index dfa1d88d955b..40d0de690ff4 100644 --- a/drivers/media/platform/cadence/cdns-csi2tx.c +++ b/drivers/media/platform/cadence/cdns-csi2tx.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include From patchwork Fri May 25 15:25:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136946 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3731244lji; Fri, 25 May 2018 08:26:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpXNMl+K6/rEgvv3K0K8FjjKaSHn4xSxnzyLHunrpfRoi0i5jYxszuLv8lI1lPy3RY3zmv0 X-Received: by 2002:a63:7d43:: with SMTP id m3-v6mr2396456pgn.117.1527262016773; Fri, 25 May 2018 08:26:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527262016; cv=none; d=google.com; s=arc-20160816; b=gsFkaOuVBTSiyZ6OFhQPvfY5fWuqWKN6WwtSDx5xVyfdN3M9hq1DFU//rsNCsUILU3 up8Cf7pgyDydESZ25xTF71e9vGOgjkcR/STCI8t3O28V+yUXJPsMUtstBZj0VaTdU1z3 78D2fLv1lZV/ngoP1Fkt745OycMVPaPZCWm3CF4G2Y7JcXHZMOflHRXCf6bJ4Xb6gxd9 RcaFq33zNHFlnHpAO6vUYe2Zimo2fXe70WiWaYT/g7Ugyp7mWmmdC8GCpJsH+tBlg5KQ 9u9CQxpXnQEwiB1lTBikrYuJtXPsSZlMmfVz6mxnth3aZcODWKMyyDN5dyfm83zTpUaO Ewyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=yoZ3LlhZD3cxDQ3ME/3SgCIAG375VWdpVREOiI7Shmw=; b=a4UTFeR+Rezp/hMjv5fwTMIFnLER5YM7IozNk2aceObEeP1PSFprtaXq7l1qf/3DzO jawcTfiuSO9zaJc5wge1xnqmWW1Wx+NykUCLLO5HycnXnW87HIUH8Gb7wCcc3vosheu6 aIPrjk4jK3I9Z++/AXaK9wIRV8M5MX8fGN1fUQrtARH+Vcm9MHXnPuRLOrlg3wHFNJf4 /24fYmW1whFlQ0lhojGkbpsYXLyM7BwnZ2GQ5yM+gBW7nbtPWCPOeE1FQpJ5WiUlAKbo Nu0JTo2VK2d+LNBLtVaG5PUoE+LIEKaN2xYWYVz0phSZf+sjhBKYxRZi8soRFWWYVmr8 AeSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n61-v6si24172104plb.256.2018.05.25.08.26.56; Fri, 25 May 2018 08:26:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966712AbeEYP0y (ORCPT + 30 others); Fri, 25 May 2018 11:26:54 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:40127 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966018AbeEYP0u (ORCPT ); Fri, 25 May 2018 11:26:50 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXzB1-1ft0hw2vF1-00WmXx; Fri, 25 May 2018 17:26:35 +0200 From: Arnd Bergmann To: Jonathan Corbet , Mauro Carvalho Chehab Cc: Arnd Bergmann , Philippe Ombredanne , Bhumika Goyal , Sakari Ailus , Hans Verkuil , Greg Kroah-Hartman , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] media: marvel-ccic: allow ccic and mmp drivers to coexist Date: Fri, 25 May 2018 17:25:11 +0200 Message-Id: <20180525152523.2821369-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525152523.2821369-1-arnd@arndb.de> References: <20180525152523.2821369-1-arnd@arndb.de> X-Provags-ID: V03:K1:HOVlfreSyqqznhiA4hm8zrijy4s0I5qMaH8mQOSLFPB2k2t2TbI 59nb/JyhDJI5gVS4UKGduMUUITLFfPm20bLDrOWPN0lZPl40wXWyXUUPHOWNej9Hcml8Vi2 6d5rJZxDexHRqnUfTSyZZSIbqvv9VKB9MGpvWRmC/isYmT9/V/Au5fyYXseBTEqJPpYoCf1 qfAUuWQxtHBifNnsK/esg== X-UI-Out-Filterresults: notjunk:1; V01:K0:jljPvD3mKN0=:jspWfsIRf1Lqk9UdctfvG4 AQF8fOhYrulbLyuTYYxSGksMH4iao6+a3V5xfBQX8sdjZrItN47x2ZarS7RwYsY3lMj26dIsD 5yhIdQqIshjQ7pKtF0c07GLKgnmDhyUTa1V7sOLT80l/V+44nLk+BWIFIJ0BKTKZWa5iF5Sm+ 0zJM8Y34t2hyWTC2eaxl84zREj4M7owWNIVVeveebENWfa7Z/3+QShk1ZLYJz0fKGJ4JCWUnp qQz6rhxqca9gU1AfWMANxC5pt64uIKJF7n4m5QrtjpeISUGyFtw4P2Uw9Gq1Fy3fo7WPqw7sK D2nr4mskneFfBiu2L/YHKB9jI0jOGhKKCXf4rbcN9TV+ZGBjsahVQPHhdLhwOCpVUcaoyth/j 0xGhKQhveypcse+s+PpKIYLzn6gVw5eIv74hF2D6oM7N5ZTE2jU0XdSJrjfLUNS9b8BLf0bbt BfCpfF2WgeRGVquqTeq65KOvdOvsrRRcw41Mga4HGfOy9omidD4E5m/GBVrSUN6N/Ri1M4af4 WkCa8iiS2UKwMWApl2nUOtw6iZ9KjMx1XeVoa1K85LA+TYP9D0y/cWN52La/xrppI+CJXrS5I gEJYjr28kc+YQaK156CVrFuoIPjty5ousW5ecqfONQO2kFXMIfURUgyz/EUcpjunqZa26yHFx tCv7HCmU8OBS459qZA6gO18z2HXLO5hFjRaaCZHDT1xu882FUI1Qvhnvtsp+mh/sQ+gc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Randconfig builds fail when one of the two is a built-in driver and the other one is a loadable module: drivers/media/platform/marvell-ccic/mcam-core.o: In function `mccic_register': mcam-core.c:(.text+0x2594): undefined reference to `__this_module' drivers/media/platform/marvell-ccic/mcam-core.o:(.rodata+0x50): undefined reference to `__this_module' The problem is that mcam-core.c can not be built both ways at the smae time. However, we can make kbuild take care of that by making the core driver a separate module, which can be either built-in or loadable as needed. Making it a separate module requires exporting a few symbols and adding the module license from the header. Fixes: 0a9c643c8faa ("media: marvel-ccic: re-enable mmp-driver build") Signed-off-by: Arnd Bergmann --- drivers/media/platform/marvell-ccic/Makefile | 9 ++++----- drivers/media/platform/marvell-ccic/mcam-core.c | 9 ++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/media/platform/marvell-ccic/Makefile b/drivers/media/platform/marvell-ccic/Makefile index 05a792c579a2..b3a4d0cdccb8 100644 --- a/drivers/media/platform/marvell-ccic/Makefile +++ b/drivers/media/platform/marvell-ccic/Makefile @@ -1,6 +1,5 @@ -obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o -cafe_ccic-y := cafe-driver.o mcam-core.o - -obj-$(CONFIG_VIDEO_MMP_CAMERA) += mmp_camera.o -mmp_camera-y := mmp-driver.o mcam-core.o +obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o mcam-core.o +cafe_ccic-y := cafe-driver.o +obj-$(CONFIG_VIDEO_MMP_CAMERA) += mmp_camera.o mcam-core.o +mmp_camera-y := mmp-driver.o diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index 80670eeee142..dfdbd4354b74 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -1720,6 +1720,7 @@ int mccic_irq(struct mcam_camera *cam, unsigned int irqs) } return handled; } +EXPORT_SYMBOL_GPL(mccic_irq); /* ---------------------------------------------------------------------- */ /* @@ -1830,7 +1831,7 @@ int mccic_register(struct mcam_camera *cam) v4l2_device_unregister(&cam->v4l2_dev); return ret; } - +EXPORT_SYMBOL_GPL(mccic_register); void mccic_shutdown(struct mcam_camera *cam) { @@ -1850,6 +1851,7 @@ void mccic_shutdown(struct mcam_camera *cam) v4l2_ctrl_handler_free(&cam->ctrl_handler); v4l2_device_unregister(&cam->v4l2_dev); } +EXPORT_SYMBOL_GPL(mccic_shutdown); /* * Power management @@ -1868,6 +1870,7 @@ void mccic_suspend(struct mcam_camera *cam) } mutex_unlock(&cam->s_mutex); } +EXPORT_SYMBOL_GPL(mccic_suspend); int mccic_resume(struct mcam_camera *cam) { @@ -1898,4 +1901,8 @@ int mccic_resume(struct mcam_camera *cam) } return ret; } +EXPORT_SYMBOL_GPL(mccic_resume); #endif /* CONFIG_PM */ + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Jonathan Corbet "); From patchwork Fri May 25 15:25:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136945 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3731179lji; Fri, 25 May 2018 08:26:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqrEVXu+Mugk/7TNGdzJiaEivScxETLe6OYOfBTCp5FzNVGqzqI+WldVof91GGNEq0gkeik X-Received: by 2002:a17:902:700a:: with SMTP id y10-v6mr1597071plk.249.1527262012768; Fri, 25 May 2018 08:26:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527262012; cv=none; d=google.com; s=arc-20160816; b=Iz1Xezqm9IuB+O5ghWU6Ou43Te78R5prJZ8ExicJFeWGDkx1FF0mlJCsaVSeHONAX9 4bf+TH0QewfkAyQX+pc6LRW3mF9rcbkPcy/JD3ItlFX+x9JOkWXVfgVArPmR4d28V8uJ NS9/GDvMFQBvio6t+6af0wOOmaL2Tt+0pi9iHUZnhF4IhVBy4QMOzEa01OhLUW7LBwqQ SEdDfRIZ/nO6aDGXwmtQhwshvyeoek2/sLyAxlsOQpNIrAzdbAHfT9qsmeMDHEhwz1zB ZMC8omCpuNexbZMdEGFoTbFWxCh3LShdLjrMnFKu2e/nlovuQRFnDvvN4JIT/SvudDF6 ll+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=5vz8t1ChnakhCK0slAvUd6RWOwBEkasQUsOjCF8oQtE=; b=vg7JYzuQKiJesp4fNjjQcek9bVY3kBziFPd8yyMtpF7lExxkjdRVTawvIQegsXRDCz Ye2O5g4kATz+pHj/4n6vplBYit0kLFHtNJxCbAO9ph7fiv/qe2Z5YA4nNvXgiYnB8vn/ h2iyysWNQ0lo1biRLyWHvIEk8ltBFIbZ+bfKXaEY6c73yD55iaKryoMvC3k55mZ+JzMX /Ej25K9Kj6IrAA/1wwsQl2c72ZD2tCXOd7YCwObE5pHvU/n6Gu0xZS7agBO3+wGZ84Mj UM/rHGjsx0oh98laZQsjSk2vkhqfMpvfj/4+O+uPAqH7Tlo1a601RDbiqhJYyBu1/VDb Jf6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n61-v6si24172104plb.256.2018.05.25.08.26.52; Fri, 25 May 2018 08:26:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966637AbeEYP0u (ORCPT + 30 others); Fri, 25 May 2018 11:26:50 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:59881 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936185AbeEYP0s (ORCPT ); Fri, 25 May 2018 11:26:48 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LxXtj-1gP28V10rj-017Dl7; Fri, 25 May 2018 17:26:44 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab , Arnd Bergmann Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] media: omap2: fix compile-testing with FB_OMAP2=m Date: Fri, 25 May 2018 17:25:12 +0200 Message-Id: <20180525152523.2821369-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525152523.2821369-1-arnd@arndb.de> References: <20180525152523.2821369-1-arnd@arndb.de> X-Provags-ID: V03:K1:cPjdStHgmjgkNsJHRdrFQFXyQAQpAlg3ebgj8XuUdU2b+hJiATX HGCQqXfsis7F3xBPERVFOn414rqiEjyFeWMn2ih+SP60bivZOB83Guzn7pYAhquVWb2/W4u ZI6lpnNDz9QdcgHsnF2F6NLf+XAGSpurOp4+FqFRDnZRRQtMwZsGRIPRItJ3FHPO3HBbI7P NZFnqP0a4H/V7BM8qzT5g== X-UI-Out-Filterresults: notjunk:1; V01:K0:5dh5rdLg1hw=:uXK/sAyipUsDC06bIsMNv/ zs2FVpKdRruQPXBzX+UKpz7sd+FhqFFU3tUtuo/x07X1W9NdZS8UWq5HcW4cE7Na1Yf1p6iRW r80wmA8KMp5sc0xVIXTAcB8DLkdZeF/CY5mAgObVIUFslE3RuKCvTlSccq+0/bIgc1kwDsJNY 1z+fOd5LTqbXluszsj/0EoahJ/6EXOUWNDnM7Ft6/nSt0vleV3HoodGH275F3qxOwnFDpKS41 xlitr7wn5CLjgktJew5Q705FkAIoLeJL0zgq9KU6bMZwlTzt43mDDKuDk+AnWUolFqylAN3mW 1f/vP+LrW82NKk6qt6Gb8Whu1hcymRs+sIZN99UayxoRbErsPnqes0DKg1H3HtHudLBUWiCyP ZEtGuxAyhOpuMTuL2IpRrRWbFXS9j/MMvqJ2ocb4p6jQz/aU/JD6XROZXuIFmd3IaelJpA6tU l4qT0iO5RbNm7ez5exTEpphpZRl3O9TPJkZS0w/KNclPPLbNMgt9mvlpvTm6Q7Qro5qKc9X6/ bQWrdUhOJDgCI9DriRJxwWcZ2XlzYG5zpoQhzwdYMI41DB6joeiu0SoS7r9jWb5a1dT37XYhX 0tZv8jQgt46Yb657+crMOm0VHmLLdKY7Qa3a130H4bdeh9vSqru8cWhvitekmfdqBk1MkD9i9 txNo1gWgde4JRP1N0McH3+N3h53BuE2LXpV/qhB3bsKVNWrB9ToDlbIrre2z5FQYREnk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Compile-testing with FB_OMAP2=m results in a link error: drivers/media/platform/omap/omap_vout.o: In function `vidioc_streamoff': omap_vout.c:(.text+0x1028): undefined reference to `omap_dispc_unregister_isr' drivers/media/platform/omap/omap_vout.o: In function `omap_vout_release': omap_vout.c:(.text+0x1330): undefined reference to `omap_dispc_unregister_isr' drivers/media/platform/omap/omap_vout.o: In function `vidioc_streamon': omap_vout.c:(.text+0x2dd4): undefined reference to `omap_dispc_register_isr' drivers/media/platform/omap/omap_vout.o: In function `omap_vout_remove': In order to enable compile-testing but still keep the correct dependency, this changes the Kconfig logic so we only allow CONFIG_COMPILE_TEST building when FB_OMAP is completely disabled, or have use the old dependency on FB_OMAP to ensure VIDEO_OMAP2_VOUT is also a loadable module when FB_OMAP2 is. Fixes: d8555fd2f452 ("media: omap2: allow building it with COMPILE_TEST && DRM_OMAP") Signed-off-by: Arnd Bergmann --- drivers/media/platform/omap/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig index a414bcbb9b08..d827b6c285a6 100644 --- a/drivers/media/platform/omap/Kconfig +++ b/drivers/media/platform/omap/Kconfig @@ -6,7 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB config VIDEO_OMAP2_VOUT tristate "OMAP2/OMAP3 V4L2-Display driver" depends on MMU - depends on FB_OMAP2 || COMPILE_TEST + depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n) depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST select VIDEOBUF_GEN select VIDEOBUF_DMA_CONTIG