From patchwork Mon Mar 14 22:40:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102582 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp314570lbc; Mon, 14 Mar 2016 15:40:53 -0700 (PDT) X-Received: by 10.66.221.167 with SMTP id qf7mr41568767pac.94.1457995252917; Mon, 14 Mar 2016 15:40:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p79si3430577pfj.212.2016.03.14.15.40.52; Mon, 14 Mar 2016 15:40: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 S1753717AbcCNWku (ORCPT + 31 others); Mon, 14 Mar 2016 18:40:50 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:62280 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752763AbcCNWkt (ORCPT ); Mon, 14 Mar 2016 18:40:49 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MNtBT-1alLfH2CKZ-007QvQ; Mon, 14 Mar 2016 23:40:32 +0100 From: Arnd Bergmann To: Hans Verkuil , Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] [media] cobalt: add MTD dependency Date: Mon, 14 Mar 2016 23:40:07 +0100 Message-Id: <1457995225-1199991-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:vC6foUqOuyDb6+Uca6uTv0pAxqnBL0QAd7prkscaXgDVafJ/+Fb p+SUFAOFGIkULE2EExR2rhFxZ3BtW4TW+xwGm9vqkEKsI5wLIqPLkVcBQ5qwpqrieCq/0ZD hx9sFpPAQtpCiHKs/Q6phDvmsIXZ5rV7xedwpzN6HhxBC52J1rhKUCsmUE4dgysP5YIMX3F 5yWzO74/W64A7tvUMnMNQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Y0IxHhyf9Ak=:CTJHYedoO/fgVP40cNhnhl rtRqQY6bFhixiy+nwgqYCRHCgxlF4v7DuGkW+OUQHHqFhOSVVPEksqqFvjWl7u5r9zL4yxVwB CfBms79T0nyzSThHJp0EhGT6LcDajfM2p2/km8YJ5Cj/75I4O242p6qCXTRAqbnlEl9xaDujm kNu9DZujbG4Sulx4CZC5q6H3X7jZ0tGMGo9wuxmSCTvZjz/FBqOUzoFPsmY94BtQzvijCUso8 RNPDel1aSXMGr4VDUw5CW0SJg05gytCV0celQ5fpXaRSpgtLk3m6LYf2ZcomKSG4hgR1HnESj 7JlbvTZvScFB3eIW0r1SRePf/CApqQyxD6prnQ9/NSGtUc8e9YibCLNhjYbz/LuzrwWVQ6Afu hM2Kh4NSxbFnFeLGX0l9rj11mhQxLiCugzizuyF0Gnqf8m5NGo0HglNDkzfQ3vCJzGwLt+kPr JRpkoXsKZzHWr5tpXfkc7CSuvYm4WJMdogGBrP/P4rsBtwrMN7N561OeG/xXpBzVFkEbNHd4r gHtvGlBXfnexNvFtrBtrETEL2B0YllN+w0Dzj2NDo6OM+T+mxWwbPqEEyFZhwyOr0nryEFO/d KxVKU8pH/NtNARHSoSMVppWvFTfEy6oHnUpQf9zUiZynEJ+BUG2pjbLMrKJND6XPFjlJxzrmq QQv76WvAYcqtNEJYDVQxA8DYLqu5ysz1rQpLxD7670rGKMnpronS83HXJ7ZkBS9wWEbc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The cobalt driver fails to link when it is built-in and MTD is disabled or a loadable module: drivers/media/built-in.o: In function `cobalt_flash_probe': :(.text+0xb8b46): undefined reference to `mtd_device_parse_register' :(.text+0xb8b88): undefined reference to `do_map_probe' drivers/media/built-in.o: In function `cobalt_flash_remove': :(.text+0xb8bb4): undefined reference to `mtd_device_unregister' :(.text+0xb8bbe): undefined reference to `map_destroy' This adds a Kconfig dependency to ensure we can call the API. Signed-off-by: Arnd Bergmann --- drivers/media/pci/cobalt/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.7.0 diff --git a/drivers/media/pci/cobalt/Kconfig b/drivers/media/pci/cobalt/Kconfig index a01f0cc745cc..70343829a125 100644 --- a/drivers/media/pci/cobalt/Kconfig +++ b/drivers/media/pci/cobalt/Kconfig @@ -4,6 +4,7 @@ config VIDEO_COBALT depends on PCI_MSI && MTD_COMPLEX_MAPPINGS depends on GPIOLIB || COMPILE_TEST depends on SND + depends on MTD select I2C_ALGOBIT select VIDEO_ADV7604 select VIDEO_ADV7511 From patchwork Mon Mar 14 22:40:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102581 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp314708lbc; Mon, 14 Mar 2016 15:41:14 -0700 (PDT) X-Received: by 10.98.19.13 with SMTP id b13mr33244196pfj.29.1457995274391; Mon, 14 Mar 2016 15:41:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n3si23276197pfb.123.2016.03.14.15.41.14; Mon, 14 Mar 2016 15:41:14 -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 S1754049AbcCNWlM (ORCPT + 31 others); Mon, 14 Mar 2016 18:41:12 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:55729 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752005AbcCNWlK (ORCPT ); Mon, 14 Mar 2016 18:41:10 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0LZvn3-1ZyVyb3R1R-00lmE2; Mon, 14 Mar 2016 23:40:52 +0100 From: Arnd Bergmann To: "Lad, Prabhakar" , Mauro Carvalho Chehab Cc: Arnd Bergmann , Hans Verkuil , Seung-Woo Kim , Benoit Parrot , Junghak Sung , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] [media] am437x-vfpe: fix typo in vpfe_get_app_input_index Date: Mon, 14 Mar 2016 23:40:08 +0100 Message-Id: <1457995225-1199991-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457995225-1199991-1-git-send-email-arnd@arndb.de> References: <1457995225-1199991-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:E89C6tdF7V0VLPB9ZIfUhCHYD/RFUixXPfESF7aWCz7XBXJUV9Q /dr36Yuj49jKQzOCiUWWc7RqZSZoSZO0en9I8gzJQlvmtsFE3/kmKIx4wyoSOuI5AVMK760 /v7UB/C/Qy2shrd0WvBK4TL2dO3vDiaIUenID2uXfM4BWM01AmIBz9VGAv3PVCTwjaMoYSu 51aW4dP6eW/Y4IQZO40dw== X-UI-Out-Filterresults: notjunk:1; V01:K0:3Dvzz97BDFE=:yMjEGrsDrPljk7TrhnNPXd Sm5PjKgP7nWYhu20Z3ozIiGftE5ltyd+zRML4wg/5V1J31iVG3phgA+z+UEVUtydrg8xc+svs Vr1Wood3A88WAHIBY8kxQ0J7JbDYK9VAizr9jcDxYazKdH1pojZLdKnmjua5792C9x06GrK5N 4NP0dQ0CwBCy7Dz/UeoIrlqA8kr6usVCDG8oINB+zzcDml1GkocbkHQ+B5O0iRmwEZuDnJ/aX ljI9DKsiJ38VfLDxRh2UGqtc6Dnf6JvE7CuiSMPiC7GntjT2kqPUqcG4q22epEJpQaNJlmu5A g/UM2D5r5UpzvWYX1JIJs9pxlRAYoXoZfYJ85mcrFcETDXpapPzCztY3o90qCM5nPWOiv+dMZ YINTya3/vfOtmFAjlKontEioWuMf/rSdTLMv2rEPndRDBWMWWlOW73MucNOZ24n6fkHGaR+h1 VALQdlhjuYtSvF8nJpPka9a52OwoxAEueXGKnOuX3tC18CbnsKKS7bLJYy0b6mi29nzt/aB2k CGHuevMaNmby6amkhoK5XowJHYdyMd3CeWIbyMZEB2RQz2IRYijlxqMqX6Rjsi+r2WPG79mVp Kknr1SPW1rYa6MarECCWBli/0x3uOO6mUcflZW0nE3rMcWfheqyyqokDSyePXQRQxkZEvbtq9 Rj7fLVAJD8ZxZM7PBQpJnh+qnToB4NCEu+tTZzQlNacx+f6M8fxWdQnMdZrY2/ROzDac= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-6 points out an obviously silly comparison in vpfe_get_app_input_index(): drivers/media/platform/am437x/am437x-vpfe.c: In function 'vpfe_get_app_input_index': drivers/media/platform/am437x/am437x-vpfe.c:1709:27: warning: self-comparison always evaluats to true [-Wtautological-compare] client->adapter->nr == client->adapter->nr) { ^~ This was introduced in a slighly incorrect conversion, and it's clear that the comparison was meant to compare the iterator to the current subdev instead, as we do in the line above. Signed-off-by: Arnd Bergmann Fixes: d37232390fd4 ("[media] media: am437x-vpfe: match the OF node/i2c addr instead of name") --- drivers/media/platform/am437x/am437x-vpfe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c index de32e3a3d4d1..e6a7bff4650c 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -1706,7 +1706,7 @@ static int vpfe_get_app_input_index(struct vpfe_device *vpfe, sdinfo = &cfg->sub_devs[i]; client = v4l2_get_subdevdata(sdinfo->sd); if (client->addr == curr_client->addr && - client->adapter->nr == client->adapter->nr) { + client->adapter->nr == curr_client->adapter->nr) { if (vpfe->current_input >= 1) return -1; *app_input_index = j + vpfe->current_input; From patchwork Mon Mar 14 22:40:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102580 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp314793lbc; Mon, 14 Mar 2016 15:41:29 -0700 (PDT) X-Received: by 10.98.76.216 with SMTP id e85mr33680688pfj.121.1457995289211; Mon, 14 Mar 2016 15:41:29 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z13si9459985pas.7.2016.03.14.15.41.28; Mon, 14 Mar 2016 15:41:29 -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 S1754149AbcCNWlQ (ORCPT + 31 others); Mon, 14 Mar 2016 18:41:16 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:61475 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754002AbcCNWlN (ORCPT ); Mon, 14 Mar 2016 18:41:13 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0LzJrN-1ZkHfZ2to9-014Vxy; Mon, 14 Mar 2016 23:41:08 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Shuah Khan , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] [media] v4l2-mc: remove unused dtv_demod variable Date: Mon, 14 Mar 2016 23:40:09 +0100 Message-Id: <1457995225-1199991-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457995225-1199991-1-git-send-email-arnd@arndb.de> References: <1457995225-1199991-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:70wvFrSAFChDuLpDlK7koq+0iSRyMwpC5JyNhAYJVLmXWpHizvt xq53Zj84AhlSTnFg7PCDjM/XKTwqr+3WFbI1OesBS3hAs70HPifSBr+teGr1nYoXBE5DhEw yWsH/uocGGMCWdK1tmnSTd0fIUSBoa1OJYLM9fg2vq7XsjB7fA1WHTFgPDKCeHPcJHrKhgx YqNFnrcCdJ/rL6WLPXhMQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:0Q0Txf6uMm4=:2cVuHyDAh0wKsnfpsKpovz 5m0o9lHbT9bSDxD7Yqa/ddosO0G2gCXn7JbvtDMMjc2e9nSDbub7dvKW8nRDxg1G0WfnpaUco Ft/ebNf0V0RwpmZfHjENZeiBG9oj05cA6oGcZKqPGi6xipU3V3FY09lNqHtUtYgVizXplbh/+ z702DwBP/YZ65gsBKxFd5rFWQdkwVExSlZ4xNJxMwu+y5zxQHisFY5pmO0m1sYMuwgty/6pTA GJbt0JQ0eVLzDgL6HldCHiZcfXg5syrS8OzQTpk7CSFxmohZ00Vt4W5TcqeYE12TmKWdEXUIS qaXzkDAhnynfJwWCCYZhZCM53U+kjUbaWjCdiYuh3b8Cmbdm7mxAUdXnPo9mScK9jkOwsCeNB qyNc6xgyXnr3ZsTl5GzCPKSrU0keG4BS+Mqo418xLULCNLMQD+vevfmoMCW9mlZ+XDPbUQWNT Jw3+yrzYB7yUcwRvmWreB+aXuVaGB9xriXJlysODPhzwvX/xdawaRPTNpWNrSy+CrZcbG2g2X CctqluxjXCUk4B+/tK/wgfMBk1qt0xnvYOa26WBlM0cb4Q9vmE4tOQQ6SRuJAQm1x5CcyeEX+ 1EohKWxyOPVzr4TJK+1XSJuNA3vsppf/kj5IL6MZHYQyJ+r00w8ts0Y63cKBLn0s/hMGG51pO CkQ2WQYVJXeUvgrggAwm34q1AwfQI5l5pYaHpVKcOxf49u5qtilgCeAGdsZDTRkdcyUk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent patch removed the only user of the 'dtv_demod' variable in v4l2_mc_create_media_graph, but did not remove the declaration, possibly as a result of an incorrect rebase: drivers/media/v4l2-core/v4l2-mc.c: In function 'v4l2_mc_create_media_graph': drivers/media/v4l2-core/v4l2-mc.c:37:55: error: unused variable 'dtv_demod' [-Werror=unused-variable] This removes the unused variable as well. Signed-off-by: Arnd Bergmann Fixes: 840f5b0572ea ("media: au0828 disable tuner to demod link in au0828_media_device_register()") --- drivers/media/v4l2-core/v4l2-mc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c index 2a7b79bc90fd..2228cd3a846e 100644 --- a/drivers/media/v4l2-core/v4l2-mc.c +++ b/drivers/media/v4l2-core/v4l2-mc.c @@ -34,7 +34,7 @@ int v4l2_mc_create_media_graph(struct media_device *mdev) { struct media_entity *entity; struct media_entity *if_vid = NULL, *if_aud = NULL; - struct media_entity *tuner = NULL, *decoder = NULL, *dtv_demod = NULL; + struct media_entity *tuner = NULL, *decoder = NULL; struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL; bool is_webcam = false; u32 flags;