From patchwork Wed Jun 29 14:26:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102076 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp2181522qgy; Wed, 29 Jun 2016 07:25:58 -0700 (PDT) X-Received: by 10.98.200.81 with SMTP id z78mr12045859pff.143.1467210358476; Wed, 29 Jun 2016 07:25:58 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v64si4621519pfv.264.2016.06.29.07.25.56; Wed, 29 Jun 2016 07:25:58 -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 S1752723AbcF2OZr (ORCPT + 30 others); Wed, 29 Jun 2016 10:25:47 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:50017 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752254AbcF2OZf (ORCPT ); Wed, 29 Jun 2016 10:25:35 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0LxKk2-1bO78r1ORO-016txI; Wed, 29 Jun 2016 16:25:15 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Greg Kroah-Hartman , Kamil Debski , Hans Verkuil , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] [media] s5p_cec: mark suspend/resume as __maybe_unused Date: Wed, 29 Jun 2016 16:26:34 +0200 Message-Id: <20160629142749.4125434-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:9Y/un9Wn6r+rSR1EF9trAB3XoGgCy8eAohMBJWB2gIe1S+p9gb5 j4wkqzqnfIxb0giYRDZXULP9EzAsobtbfxwEdr2yZQ/qDhUt2b8fob++xS/VUs2dmVhkYwY XvsOLXmnQQWbaz1+V3x3R/bTfoyrrlg+RETDHWqP+c/qwYTgMWRYeCobmoH09vYQ85Ot+XH WC63cnZbUl4s1mC6LrpMg== X-UI-Out-Filterresults: notjunk:1; V01:K0:N1PYNXbQgrA=:dCZfrKq7irSm17TMFS7pse TXOvj4SVSQpJBtPwcvXARGMH7+6reiMHM2LQA5paJQu9UvnWPyIJ/77YhFmgUNWb0s2ZVIJpx EdTsZxcJWjNrKHoQggPErrSR+H9+OlRFVEGejNsWCP1i7rpZ4gFUYnhgRP9tSJzAPAM8Ka3Ki TS9F37zQJ6RMqRJOYgE0Wf0NvIF8CmB9gESQB4iQ3MAKGmiV1UlIMKaN8kqYptNkLsNMOSA/i 2bWC9oF+GTnjzCvfydU8MbjehoTEmzgWtMQsuHM90bbqUdEU4xsMHjNenevF234XeovKT7B5Q Y3E5JNJcKMRD8VOfwUy9VW7NAlgxGb5ClUR8/9AZPnNxnSmTXMS1xYrjV+SiJQ7/Roi8Jg4CL 1Zz5DhPH9q9Q3szo/++fhh/rnc18Vf3m+zPNA+wB87EX4bNFNUvRu02hWWU4m/AwRsrK3ul/K GoPPYSAZDqTKA24rXx2/xYYKfhTYjn2ii7VXT8ekhG/Y0kx72rVZ45hQdPtlTfGy/IJmXwIFZ lVtVFUSGBonot9m4VUlzChChcH3gWpikQMlYb9ks6dzC5f/VegyCI0++8iIBW9vyTKcBNnSEC 4uW2Ni4bgsWmU+pwusrWTuhYnY0WFqTWHwrdRthn60ie3KfER5Z3VB9f2YplesNhaXyIej0ju kxkRDQUmYlLeOUL3tcChpJpgYMTEvsf63R3dSPWawXm0L5qiLBBjQEO0m6KSyieShnY4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The suspend/resume functions in the s5p-cec driver are only referenced when CONFIG_PM is enabled, so we get a warning about unused functions otherwise: drivers/staging/media/s5p-cec/s5p_cec.c:260:12: error: 's5p_cec_resume' defined but not used [-Werror=unused-function] static int s5p_cec_resume(struct device *dev) ^~~~~~~~~~~~~~ drivers/staging/media/s5p-cec/s5p_cec.c:253:12: error: 's5p_cec_suspend' defined but not used [-Werror=unused-function] static int s5p_cec_suspend(struct device *dev) This marks them as __maybe_unused to avoid the warning without having to introduce an extra #ifdef. Signed-off-by: Arnd Bergmann --- drivers/staging/media/s5p-cec/s5p_cec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/staging/media/s5p-cec/s5p_cec.c index f90b7c4e48fe..78333273c4e5 100644 --- a/drivers/staging/media/s5p-cec/s5p_cec.c +++ b/drivers/staging/media/s5p-cec/s5p_cec.c @@ -250,14 +250,14 @@ static int s5p_cec_runtime_resume(struct device *dev) return 0; } -static int s5p_cec_suspend(struct device *dev) +static int __maybe_unused s5p_cec_suspend(struct device *dev) { if (pm_runtime_suspended(dev)) return 0; return s5p_cec_runtime_suspend(dev); } -static int s5p_cec_resume(struct device *dev) +static int __maybe_unused s5p_cec_resume(struct device *dev) { if (pm_runtime_suspended(dev)) return 0; From patchwork Wed Jun 29 14:26:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102075 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp2181653qgy; Wed, 29 Jun 2016 07:26:16 -0700 (PDT) X-Received: by 10.98.43.7 with SMTP id r7mr12165381pfr.65.1467210375750; Wed, 29 Jun 2016 07:26:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fb10si4638076pab.212.2016.06.29.07.26.15; Wed, 29 Jun 2016 07:26:15 -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 S1752771AbcF2OZ7 (ORCPT + 30 others); Wed, 29 Jun 2016 10:25:59 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:57643 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752523AbcF2OZ4 (ORCPT ); Wed, 29 Jun 2016 10:25:56 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0LqpOw-1bmM7v0bSs-00ePom; Wed, 29 Jun 2016 16:25:37 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Hans Verkuil , Greg Kroah-Hartman , Kamil Debski , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] [media] cec: add MEDIA_SUPPORT dependency Date: Wed, 29 Jun 2016 16:26:35 +0200 Message-Id: <20160629142749.4125434-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160629142749.4125434-1-arnd@arndb.de> References: <20160629142749.4125434-1-arnd@arndb.de> X-Provags-ID: V03:K0:MVIOZguEPVyRD/C/TX1ga0MoBMZituZWMYkvhcNRHZAOPhsuzpD 6nee6iNJORa3xFfKV1kOoF8QSNP+slYmoNo5bXq0yLJLun/8lJg3C2JcvIFmMmHt8Y28nAm hbKsM9ifegMdHNBuwz+mXFCcJ0soEp6+nNTXR0Xu9rF9rTDM5tXXtoVi4Zc+4ltdYex8csz s10TZeCC+zKeNkvfadfGQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:SQaFLaG6jSE=:S8IOUQOwapH2ShDy6Yy9rq ifC7YEbahz3dIupkbpVJGEfwsVFYShKX1WgMfAki6P4LBV1Alq29FK+7173MqwYQ8Jp0CAHwl ZmFx9KvrO2kHthCxVk80wQlF/iZqj3woUNYFWDgNyBbwCNfGFL+/IAPwTsTcAVCnUnS07xtQH QV/bTXEbjBs1L4HF12IfdCitCW9Vroyv2ne/18ivpzxc0RRpcAd+c/Csj8aH9YzOud9QiijVh YCfv7lix754niJiUxd6Y/ZEY+R+L0esOVB9QUAbVgsDoP0JCE/VW+iymZJmcnMGS8eeIw6Oog CyGdfSr2H/JtCl6iJOAk5+lTnvfzFfiQk90IaLtQi7DIoQfNc4nT3oY5svLjGB5Q7a727gjq6 rJOBaC0OjfB7cZat+CxbLFf21L7l5WSiAA+AAg2yeRTtxoUTb5t5DZfExZ229leIJHVvyr9bh 8aALRGbtREMVxGUDbdgs7ei2nBjKQ1d4TZ1MnRZmhSbvT2fTK53Id2Qeh0HvWuSscTLVtQaae yVsg8y4948fTWe2Do9R5Duc4s6KHFkCYoRZ6jlPJR1sS57J7FOhPH/De9huauJ8sPET/qGxtN KQIuKOAizXPJ2Q7vq28d9ry4c1XgCoZtHgNRfHKWmknsuKJjX5ByeIlY2QoC32qvlDmqObjQ3 8H8KO3FYBTkXI+j5JhZMQOATzdK2FO40zMCwpHq7rKvDN1UTmV8o4IVA5XV6Xv2ENur8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The MEDIA_CEC_EDID option is guarded by MEDIA_SUPPORT, so selecting it from MEDIA_CEC produces a warning: warning: (MEDIA_CEC) selects MEDIA_CEC_EDID which has unmet direct dependencies (MEDIA_SUPPORT) The warning is harmless, but it's better to add an explicit dependency to shut it up, to reduce the noise during randconfig builds. Signed-off-by: Arnd Bergmann Fixes: ca684386e6e2 ("[media] cec: add HDMI CEC framework (api)") --- drivers/staging/media/cec/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/staging/media/cec/Kconfig b/drivers/staging/media/cec/Kconfig index 8a7aceeac815..cd523590ea6f 100644 --- a/drivers/staging/media/cec/Kconfig +++ b/drivers/staging/media/cec/Kconfig @@ -1,5 +1,6 @@ config MEDIA_CEC tristate "CEC API (EXPERIMENTAL)" + depends on MEDIA_SUPPORT select MEDIA_CEC_EDID ---help--- Enable the CEC API. From patchwork Wed Jun 29 14:26:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102074 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp2181735qgy; Wed, 29 Jun 2016 07:26:26 -0700 (PDT) X-Received: by 10.66.27.211 with SMTP id v19mr12129416pag.112.1467210386068; Wed, 29 Jun 2016 07:26:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fb10si4638076pab.212.2016.06.29.07.26.15; Wed, 29 Jun 2016 07:26:26 -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 S1752825AbcF2O0J (ORCPT + 30 others); Wed, 29 Jun 2016 10:26:09 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:51279 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752772AbcF2O0G (ORCPT ); Wed, 29 Jun 2016 10:26:06 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0Lj7Eo-1bu4IZ3GQQ-00dII0; Wed, 29 Jun 2016 16:25:53 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Hans Verkuil , Greg Kroah-Hartman , Kamil Debski , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] [media] cec: add RC_CORE dependency Date: Wed, 29 Jun 2016 16:26:36 +0200 Message-Id: <20160629142749.4125434-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160629142749.4125434-1-arnd@arndb.de> References: <20160629142749.4125434-1-arnd@arndb.de> X-Provags-ID: V03:K0:QSSJzXd0Fc2TC8+jQQnkU81zo4HvkPlCW8stqxnq2wH6y0s9fRC Yh6wrWSF6dG+5FyEf0xJoOlgID1aIjWsfZ78kslhGO54QdXm2UPFZ39iHK1orMun/IMajby y+iZx77U0d8F5G9WMzJDAsg/FLBPVnS+rD3+Qsyltedrk08Z4EJgqZFBFq5p/GPLrk+3K46 iiZVBEknDM3Emw+jXrJ6w== X-UI-Out-Filterresults: notjunk:1; V01:K0:tTvpPLxWYmk=:7t8qhBv7YGM9jomz2DrB+Q y9mD50YTMuHSohtc+HrfhouTwP9r4NTaEixa3qW9iyO1xcAC8hi43z2Ko09qsTb/LekkOBayz NRY5cS15lEHc+jkrTNrusOLX8FAnfA4Jr2k2t8RrtGULkhQZNF/u4jWkJ0Hm/2XIz5DBjtVZd wgcBVxdR0XF0egq6q5Y3ClxGSw/p0W4yJWkdZan+sae3BLAUOwjUHIYHIrusfUdKY2rPHS7+c oDk7RNSHh+XRcrCAMMwDPyaWi9TQJos7ceUAHbjF/KvEkkgOMIW7sZLG32anfb7GGFF5EGMAx oYYW87BZ/q/zZR7adl8O6CiO2fScQwaiD0sZGoZQRnCgqqWucZN0p1WAaV9eZOu4ADIBqAUjs wr41l3Wgw1BXlUEXEhDiwxZK96S5Rrwpr4WfUtEISc7j6uwqLt4+F6/SCEeNI3aWuvfDiiML6 uLMiaNAOy5hdtK5jxYmi1SwYD/x0T2vbZQkip8VSbFPcOQvFq+JawT0a9H1SV1tpdONMVKo1X ycdvREFneg/6cUAfyzV2pGqr0qq+zUOWdDXJBjxl8caOoqcD6FvLeo28g8phk6+3WbMvJ7+AS fQKwhGp/Zux4mB2CdRCptyFXXBMBt4uivcSsZbO6qFMVldLtXRpWZIWENd+QeVLZxAICAcMVX U++yqtgjmQMiIe8Tbh5E2BOPwEF6G6CZ6PcE+snVWILpSfkbcNqJm34j9oss2tgurNKY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We cannot build the cec driver when the RC core is a module and cec is built-in: drivers/staging/built-in.o: In function `cec_allocate_adapter': :(.text+0x134): undefined reference to `rc_allocate_device' drivers/staging/built-in.o: In function `cec_register_adapter': :(.text+0x304): undefined reference to `rc_register_device' This adds an explicit dependency to avoid this case. We still allow building when CONFIG_RC_CORE is disabled completely, as the driver has checks for this case itself. Signed-off-by: Arnd Bergmann --- drivers/staging/media/cec/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/staging/media/cec/Kconfig b/drivers/staging/media/cec/Kconfig index cd523590ea6f..b83b4d83946d 100644 --- a/drivers/staging/media/cec/Kconfig +++ b/drivers/staging/media/cec/Kconfig @@ -1,6 +1,7 @@ config MEDIA_CEC tristate "CEC API (EXPERIMENTAL)" depends on MEDIA_SUPPORT + depends on RC_CORE || !RC_CORE select MEDIA_CEC_EDID ---help--- Enable the CEC API.