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: 8584071 Return-Path: X-Original-To: patchwork-linux-media@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 13BEFC0554 for ; Mon, 14 Mar 2016 22:41:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38D7620254 for ; Mon, 14 Mar 2016 22:41:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D6092034C for ; Mon, 14 Mar 2016 22:41:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754118AbcCNWlQ (ORCPT ); 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-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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(-) 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;