From patchwork Tue Jan 26 16:17:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8124651 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 89AFABEEE5 for ; Tue, 26 Jan 2016 16:18:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5D7A2026D for ; Tue, 26 Jan 2016 16:18:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 771462026C for ; Tue, 26 Jan 2016 16:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966367AbcAZQSW (ORCPT ); Tue, 26 Jan 2016 11:18:22 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:55898 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965442AbcAZQSV (ORCPT ); Tue, 26 Jan 2016 11:18:21 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0MWbbG-1ad1tK1s2k-00XfhW; Tue, 26 Jan 2016 17:17:44 +0100 From: Arnd Bergmann To: Hans de Goede , Mauro Carvalho Chehab Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [SUBMITTED] [media] pwc: hide unused label Date: Tue, 26 Jan 2016 17:17:24 +0100 Message-Id: <1453825059-3339577-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:0jM3A00evLBR7Z3E2bWE8P4v7b3YDZul/EwDhDXPf5r/WLVxC4L MxeOMLpZMxKpU4q9axk/qmen4gxlou6vKTei5av4dqMbD7u5UQMX0iXzr0xi/SogGcGEEkQ yh2pJ4MDvSHVYQHE3bRjs+KQ9JigrYRYobPcPs/0DMI9fUE/DV3/qYW587HANO130N8vGJt uyaB8a/Nb+YLdZWZ5X+Bw== X-UI-Out-Filterresults: notjunk:1; V01:K0:gsBEP9tWdR8=:OHlqlZdsCSaldToBWQFWaU U11EcaEQgG4TEAzlA+qvtQe8l8fQmn5bKLVNUZT+VFUnqGRQTvv2h2fi2qGZNZvfGOugjr3p0 hoMD1LDCzewQQ7f57knXDlyW2K7mE6Lb4gHQatfQGMAwjsIC9vagSteFLYPvrCB5nHg5kY+Zz QmJzJyCOz6zg9sV47LHqZ/wshlXaDpMVZusRtzkYBjG0Ejvo/T2OBUJK7IfBCfAD/oWfP0UhP oiRbI4LMuh/fTDVJiI6HEqAAyETtfMGbvufR/rj/Uuxdm9b2jbcTzXQF3S/1LYS4UGIzJyj1m OzxWkcMw4XApHcHhOVxMvTCQge5gNVFVxkdW/fmzVqkFSn72S3APkrnynd8cN79ysvXTBQIal LvFlUIyB14kUzWnNbaML//OCA3S3JdBhY+8sSD2qgYcOgjlDejvfoYrUKl23TUv06t8jJ1p+l yVSs8UqlNuYz+668ShRdkj+vLhJd/uaLiXls5lLeXd/TnY5IHQaAHIxFV5AfFoSij1tortpfx pj7CwJGYwTnfaORBP80/CfQxjassesQNItN/HOI9rMqfeQ2JltA0nRnaGO8/T1Zlo4FMApFeG OX5JDl67HjuNOEZIj6x9zzTNj6V9wyhOXxdzAdZ0s277Ezbh65OZBVxZd+3SF5amwbR/YhfKJ 5C2SCVK0N/5Vk1nP5YJKoU5udO0RzhrgA6Y0xopRzBgKOU/3zAdiUXADfqYyaAgVY8JY= 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 The pwc driver causes a warning when CONFIG_USB_PWC_INPUT_EVDEV is unset: drivers/media/usb/pwc/pwc-if.c: In function 'usb_pwc_probe': drivers/media/usb/pwc/pwc-if.c:1115:1: warning: label 'err_video_unreg' defined but not used [-Wunused-label] This moves the unused label and code inside another #ifdef to get rid of the warning. Signed-off-by: Arnd Bergmann --- drivers/media/usb/pwc/pwc-if.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 086cf1c7bd7d..432554d07e6e 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c @@ -1112,8 +1112,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id return 0; +#ifdef CONFIG_USB_PWC_INPUT_EVDEV err_video_unreg: video_unregister_device(&pdev->vdev); +#endif err_unregister_v4l2_dev: v4l2_device_unregister(&pdev->v4l2_dev); err_free_controls: