From patchwork Tue Jul 25 15:36:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9862327 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F31C7600F5 for ; Tue, 25 Jul 2017 15:38:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E60E527F3E for ; Tue, 25 Jul 2017 15:38:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA5AA286B6; Tue, 25 Jul 2017 15:38:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98B4727F3E for ; Tue, 25 Jul 2017 15:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752242AbdGYPh4 (ORCPT ); Tue, 25 Jul 2017 11:37:56 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:61531 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752144AbdGYPhz (ORCPT ); Tue, 25 Jul 2017 11:37:55 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MOXED-1dUGbx1CSb-005sAC; Tue, 25 Jul 2017 17:37:40 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab , Sakari Ailus , Chiranjeevi Rapolu Cc: Arnd Bergmann , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: i2c: add KConfig dependencies Date: Tue, 25 Jul 2017 17:36:45 +0200 Message-Id: <20170725153735.239734-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:VgkQI3RSl5gVaBupFTNvHlNNpazl9u/0n/YWXb6I12imM+iuZhp QADPf0DBq+M9Wj+NNIIKagXad4PfRusiUa5YrF0Xl7Sgo6JA4nX2DYjP7aAm0MYt7elCLHi Hcvd2O9e0k1uq0OK9FsXGUhYcoJNRyu35RXbqWFdRRcutq4dtw257wFy0QSbc2GxAwzZdAP tBG7mnyisnSw8kg+tD6xA== X-UI-Out-Filterresults: notjunk:1; V01:K0:RVYZ9+Ypubg=:8QInPlXvPRkb3h0FVH2Z2b TXXV4RJtqt/Stw6XPGUyAek5yM+jwJg5PmD5zy3TMTs5UNphCW1T2ydIa74IL6Qrhht0xs3QA 9BnISbxJd7AO3Fh7xiIxRCQTdL1CNSTfa3gjYLaj1lZ93oW5B04LSTsbsLn/wI8cxp0sCmi9o ft7/7Pg/GHMeSaiRrHAWlfkonNqfeMYJSwxuaHDbySRHV9b0I6bnbIkaRJlxUX/Kl6BEPzpSR BiQAcK/GD9G1qXChig057sTxGgk2cM1hZV1DcBeHB1VNrQSfTgf4hUD0aU6k43DYoR/U8LuQa B10ApZ9EFlQ1SwiwX0N4aiX7/0NrdUgTCzaEt02t4VI0mQmMdg9dU1L9JrRD92DfhRpLHA94Q JBLRolaTNpn2uFMcB6qCJSBYEyoX1TIaAvKzcQnqxbPIs3NhGcHn61o/cVtNUjMTo32bvGvcf +YNlavqdRn1o9kIEWhQVurH9966aE5kllWHJy1d6Uy1bCmh1o7tT4V6TG3qqKguy5MAmqEFsu i+6PpehPJJviRbiVoDzUBovd/qdmcpP0D9oI9D0/VP/7QNTNFWwA4dXmnJbvrBI4noZedS7/W /dk6IWLgDOhfHmrLej+uSHhXNQPZ50iM+R4it7kagNyJyl9oOXqTkz9VsrMtwMizLwmw52shy 7yk2tvG9TiqkwbB9qcT2Ui12FqrNCEX3J9G46ZR2Zb1S89CTI5dkMEknidy18Pl41cSb7mJRS Qx/IJKcI2bhgdyfwh4eH6WJdmJFI398BYOXLow== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new ov5670 driver fails to build when VIDEO_V4L2_SUBDEV_API or MEDIA_CONTROLLER are disabled: drivers/media/i2c/ov5670.c: In function 'ov5670_open': drivers/media/i2c/ov5670.c:1917:5: error: implicit declaration of function 'v4l2_subdev_get_try_format'; did you mean 'v4l2_subdev_notify_event'? [-Werror=implicit-function-declaration] v4l2_subdev_get_try_format(sd, fh->pad, 0); ^~~~~~~~~~~~~~~~~~~~~~~~~~ v4l2_subdev_notify_event drivers/media/i2c/ov5670.c:1917:38: error: 'struct v4l2_subdev_fh' has no member named 'pad' v4l2_subdev_get_try_format(sd, fh->pad, 0); ^~ drivers/media/i2c/ov5670.c: In function 'ov5670_do_get_pad_format': drivers/media/i2c/ov5670.c:2198:17: error: invalid type argument of unary '*' (have 'int') fmt->format = *v4l2_subdev_get_try_format(&ov5670->sd, cfg, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fmt->pad); ~~~~~~~~~ drivers/media/i2c/ov5670.c: At top level: drivers/media/i2c/ov5670.c:2444:19: error: 'v4l2_subdev_link_validate' undeclared here (not in a function); did you mean 'v4l2_subdev_init'? .link_validate = v4l2_subdev_link_validate, ^~~~~~~~~~~~~~~~~~~~~~~~~ v4l2_subdev_init drivers/media/i2c/ov5670.c: In function 'ov5670_probe': drivers/media/i2c/ov5670.c:2492:12: error: 'struct v4l2_subdev' has no member named 'entity' This adds both to the Kconfig entry. Fixes: 5de35c9b8dcd ("media: i2c: Add Omnivision OV5670 5M sensor support") Signed-off-by: Arnd Bergmann --- drivers/media/i2c/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index a05e40ecba7c..94153895fcd4 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -618,8 +618,9 @@ config VIDEO_OV6650 config VIDEO_OV5670 tristate "OmniVision OV5670 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT + depends on MEDIA_CONTROLLER select V4L2_FWNODE ---help--- This is a Video4Linux2 sensor-level driver for the OmniVision