From patchwork Thu Mar 1 15:27:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130285 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952490edc; Thu, 1 Mar 2018 07:38:36 -0800 (PST) X-Google-Smtp-Source: AG47ELv/znYVWA+oRro9tpOPzAjrC1VUIo/TYtb8BFIjZqOhgVtft+DoZAQVh5zjoJP6dHIGgqnD X-Received: by 2002:a17:902:bd41:: with SMTP id b1-v6mr2276798plx.147.1519918716607; Thu, 01 Mar 2018 07:38:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918716; cv=none; d=google.com; s=arc-20160816; b=d0JUmhLBGY7AYCSThu1TSHA+AtwWwEqOZ63eMokjaZwlwDnm+7fUb8z1sssYtXFODn gtOl42DX6dGCZdvXSuncw9Zh145wNa7lEVD4+DguC1SaCQL+X/a6ja6a7wfc00fBuvWU myXIEscW+tLntCZ8atRslT8J1pdT6vF2nbVaeoXUrSzBmZw83TM06hyruzElZntDmV7X xRC20JU9xxPh6e58QX6sdmnrg3PRmm3OHlccLqflS5s5dApuWeZxZ9gC6kDc8JzA2YQG g9nO3ghSJlilEzVQmaNljX5rdaKYIDmmxEnoy5XYj0Ux2XH778vXdgTyZa+659AP+Z/S Z+4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=rD6PDE0un8zcfM5C8oJiA4Ol+ku2Rc5wxIyQbZFzZls=; b=KPHWjLopAjXlguOJ7XuJC8iz10tCXVO93mN3rjiGEBuJFgaKvvM0uY5N0ffpP8pwPw Xy1c0Zj/w6SdplGw8xs3kUce2NnwoqJXK1GwNModAR05fYTFGqiB6DpoG9qMMzsg3dbS ZjKNO+mKKxupmJDGWZUUOayL4ww8svYc8wj3iwklYWkJQMQdCHu0TKYCqk7kU5H4RWqb 16OwfVDe6bRSHt9s/e+wd7qNl3NDbHdMcLBPwYhqeg1pIEvc9yft453mW3uUFWhpdJrz uEDBOKanh4LI63TXjMn2Ly9Nci/cG506pX7KbGGeyotT9GGd2roGlkVLUoD6AOqBLV+f vwtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=aAZLLA3R; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si2586092pgs.318.2018.03.01.07.38.36; Thu, 01 Mar 2018 07:38:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=aAZLLA3R; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032020AbeCAPie (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:34 -0500 Received: from mail-sn1nam02on0103.outbound.protection.outlook.com ([104.47.36.103]:11220 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032553AbeCAPia (ORCPT ); Thu, 1 Mar 2018 10:38:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rD6PDE0un8zcfM5C8oJiA4Ol+ku2Rc5wxIyQbZFzZls=; b=aAZLLA3RtwB2oMZklYXPHoRbgkmpG3Xpp9O2GqSjffffgn2wBpz0wPL2mQf8Ih7U6B4G8yPGchJIgL5/aWmZbEdC+TupHY493snYiMvgBCASaZveIZVIyfxXlomgX5nkvhz8EHcO9/9NJ/8MmXCFtNy2aQY/sQ1DrkgR8CF4UKA= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1016.namprd21.prod.outlook.com (52.132.133.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:38:25 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:38:25 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [added to the 4.1 stable tree] [media] pwc: hide unused label Thread-Topic: [added to the 4.1 stable tree] [media] pwc: hide unused label Thread-Index: AQHTsXHLAXY+uub0vEOUQbk0Ra5Z7w== Date: Thu, 1 Mar 2018 15:27:22 +0000 Message-ID: <20180301152116.1486-457-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1016; 7:fEMsHs2s5PVHCKP7ts/J0Xq5/I7q7xCL4IzqISpVGQnlGUylE/DXHJaTI3PxtRiVlqy4r3JrEgyTcQHqj1Ns59fB2J5JZGsV9RBV6zdsofQUKW7i83KbzDKWkI9JSrGImnmNtf1I3LVUBdHPIiP+m3VMpTBWe4WQhxLpuSL9swTExroeo3u3WS45oZh9xP+bthZ15NOijKWT4NDiGNHoAe7HX0/Uf6eWhp1fOk0jLZWrP8xKt7RM8nGC89h2IoBI x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: aaf9a856-fab0-4268-834c-08d57f8a792c x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1016; x-ms-traffictypediagnostic: DM5PR2101MB1016: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(95692535739014)(17755550239193); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501229)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1016; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1016; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(39860400002)(39380400002)(376002)(396003)(189003)(199004)(22452003)(6436002)(8676002)(81156014)(81166006)(53936002)(68736007)(6486002)(6512007)(97736004)(5660300001)(86362001)(59450400001)(6506007)(102836004)(6346003)(2906002)(26005)(186003)(4326008)(10290500003)(8936002)(76176011)(478600001)(105586002)(3280700002)(14454004)(54906003)(110136005)(3660700001)(2950100002)(305945005)(7736002)(6116002)(72206003)(1076002)(3846002)(6666003)(316002)(2900100001)(25786009)(36756003)(2501003)(66066001)(107886003)(106356001)(5250100002)(86612001)(99286004)(10090500001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1016; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 8k1LWGC1fRc4G+U+7tMnD09NrxdE9uQIdvGk1tX8ItxqjFXCG8mPg0hIiL3tpt5o/+R2nIDc96Q0EpAzU5kTvATmTLmNsTLSf0966uQm0hhDm/sA35lAgnE21cYkoAL0v96Jjqa7hh+xkOT7dTGADOeQlKgkBTj8mPjrkULV59I= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: aaf9a856-fab0-4268-834c-08d57f8a792c X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:22.8550 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1016 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit 1f6bcd011464cb36059e2562f72baf75f98b732d ] 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- 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 a7e1f6f37790..a8f265cee365 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c @@ -1110,8 +1110,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: