From patchwork Thu Mar 1 15:27:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130303 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2953164edc; Thu, 1 Mar 2018 07:39:10 -0800 (PST) X-Google-Smtp-Source: AG47ELsZU3cOCL2buFjy4SQzKe4bALqZYj9RMefH5HuRhmVSdi9ur+U5QVwfLBAASvIdgR8sYCb7 X-Received: by 10.101.85.67 with SMTP id t3mr1908033pgr.310.1519918750578; Thu, 01 Mar 2018 07:39:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918750; cv=none; d=google.com; s=arc-20160816; b=HW9Jd0NRBXvXKq1x7hy8Cu9YVxLPxMAuthHFpQXy8vjlsFqyWQse8HV2uhQeirI/Bf Jmiq6i0DQmBLDag5aDpyGCD/Z1soTOU0M2oQM0EXznAAGkr9cU09DD7T265E90M0uyyA BGuIgzVkKRAqV8OplPzz66v1s70w1WsydjvOc0e7QRkFacuslPfokmdFOQbCWihIDeE8 dNtzhO/ZR50QT80xS3RxgdnBrr7wimFl0qVo/dIFzet5/EBo9N9gRUCMbQTHAQtyhkQq XH9UnI6p/hThV6LH7CTpja6iXBTJo+87qJggyWLtXTxed5ZM1td2ZxYVsI/oTD8FQ8PN waJA== 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 :content-id: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=rJfPX1zWAAgTzXpp+UEV8pNrcNZo1slUmSywVUaDQCc=; b=zK+eLQIUOU+rnzF5zwAYR+0A7Y3EZD+aJOft2pbGp+2LtaLea5fbj1G83HPe7i4bN9 MLwJStVDMztCU6fPcml2XJkHSojRGu/A8HaAfazso3FBvN0ytd92A2T8WDotLPCCrz0C cwKTXqLlpXF6ERxrfGYB/k8xa4ogNJUrVWmD8IZMpXpQLwL0B4kCQwBcnWOHlcVtWWFv bKFpMVTcYtnDu8I9rTcX31NsWX5UhUoPvK5UGh9tRCm88Tqo7RPGOEem3ikvxt6kHL+l KqtnxU+9j4clb9GEeMjnYCpmVL8mpEV6kWqQpqF0CK50P6pcvP3nuznX05x5xVOriYdH LJrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=aSF6Rp/Z; 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 k131si2602581pgc.361.2018.03.01.07.39.10; Thu, 01 Mar 2018 07:39:10 -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=aSF6Rp/Z; 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 S1032592AbeCAPjG (ORCPT + 10 others); Thu, 1 Mar 2018 10:39:06 -0500 Received: from mail-cys01nam02on0129.outbound.protection.outlook.com ([104.47.37.129]:26947 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032567AbeCAPij (ORCPT ); Thu, 1 Mar 2018 10:38:39 -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=rJfPX1zWAAgTzXpp+UEV8pNrcNZo1slUmSywVUaDQCc=; b=aSF6Rp/ZCBciSrC1t50XxyablIl4q/4Z7lvvpINZfSR+oglQP0Dh07GfZ2/pcGyV7/ShKsG8v4AmZUinHdT2PsANrCTgB+65X2toFj090pT9phr7YJXTD95FO4kzHaeloMQYubWg38HbJZJp6Xiv1oncF58rY2rXUL80BnP3q/w= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1077.namprd21.prod.outlook.com (52.132.130.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.3; Thu, 1 Mar 2018 15:38:37 +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:37 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , "David S . Miller" , Sasha Levin Subject: [added to the 4.1 stable tree] tlan: avoid unused label with PCI=n Thread-Topic: [added to the 4.1 stable tree] tlan: avoid unused label with PCI=n Thread-Index: AQHTsXHQSUYYjFFuJ0e6/YMIaMVy/w== Date: Thu, 1 Mar 2018 15:27:31 +0000 Message-ID: <20180301152116.1486-471-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; DM5PR2101MB1077; 6:E4Gvun9J17hIkjvyA8twhsBAjhWDRrsgnRBLjukFnDYSqHSF83PN4loL5byT8fA2bLtq1d3DEfPqCd/EJ8PJbchB1jmR6bwKFMActf2Vaxt8V0lFIL9hXnnKi1vaOMurakdWkXROUgYDWkBzbLkC7ySQTJaYw3Cm8nu4Fs1tjtFhVaqsSczihPeA6SUaGHYIYYGqynpujcOoRWNAqGwf0fP+sYp+lv0EY30IuGxnGcUrkdheuCGj++yrTpVW/uHTKneeLWqTwSmv8lLbdTgfiC34mICC3Xrw9xMoOVyUtoxUO0x6ONavJnO1bJ3HSEMhZd4y7ph7njzdrxM8SQOIg3sJjh19PlVgvbisbKlHDdHHusiuwXAjemBB+f+htC+H; 5:F6OkpoQVaNhHiqIteKgrEEBmzeNZO4flCK0eS/zmr+fGiV/lP5RbbzTAnJZLJMMG//FZtHQMtW4E1pMFt3snUbB9oL+UkpvGh0ldSnQHp/LSH1x4td/D0S9sT+U9iHJzTu5Svgm6BIQeWoH00Cfn0TIhnRwrB+opK/Gr/InUIq8=; 24:Hzab34eMl6JF651KK9TQAUExYeWgoUA9zB+mx3oF0Y/uKetkSO0++ByZbAWVzYVQYst2X2G1l7DYX7WtarOsrl3Q1nCdesvRjeI0yUrobUg=; 7:+76vDsMYH2PyVT5Xsf/Q+R9Bzd+xEmYVXIXJgIvople5S+62NI0LNR+frUKnddX64bU0S+XzB/BKcz4TWpW/1uizp62WG6ZQ5rdGcQMcRUklDpHbu8TqpbIhjS49yp0OaiCeQbTDqeqwvAAuvo+z+OnO9mgme2LNB4H2NVOpl+aLlftbt+EMufI3LMRCFQFpcDMQEguxdBayjW7yqR3kK9KDvs1WXRo7KQ5ZG9xyJLvnBrmoLywiBh8Gbnvl80IO x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b10e3153-eedf-4805-54f7-08d57f8a7ffa x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1077; x-ms-traffictypediagnostic: DM5PR2101MB1077: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501224)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR2101MB1077; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1077; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(346002)(376002)(39380400002)(39860400002)(396003)(366004)(189003)(199004)(81166006)(2900100001)(10090500001)(2906002)(81156014)(66066001)(8676002)(1076002)(6116002)(3846002)(105586002)(8936002)(107886003)(186003)(106356001)(478600001)(22452003)(14454004)(4326008)(68736007)(25786009)(10290500003)(102836004)(6506007)(6346003)(59450400001)(26005)(36756003)(72206003)(6512007)(53936002)(6486002)(3280700002)(6436002)(3660700001)(316002)(76176011)(110136005)(5250100002)(86362001)(54906003)(575784001)(7736002)(5660300001)(2950100002)(99286004)(86612001)(2501003)(305945005)(97736004)(6666003)(22906009)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1077; 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: kLbRVhg7S0/+fq6hM2Xh5Cp13Z9bJyBMhDuVIgNBLAf+POtToZP16Kl4RB1glbgnB2v9/PANpNh3cJUxhUK6evNxADzl3Z1M2p+AoQcsz7C4RBmNLssSjeV4y5SkknEORth79TAHNgZ1FLW0+fEG2+ADtosL8qHlubAjt4U2Sp0= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b10e3153-eedf-4805-54f7-08d57f8a7ffa X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:31.9874 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1077 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 1e09c106a44c2b2685a77a1ef27951381c9fcd23 ] While build testing with randconfig on x86, I ran into this warning that appears to have been around forever drivers/net/ethernet/ti/tlan.c: In function ‘tlan_probe1’: drivers/net/ethernet/ti/tlan.c:614:1: error: label ‘err_out’ defined but not used [-Werror=unused-label] This can be trivially avoided by just moving the label into the existing #ifdef. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/tlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c index 691ec936e88d..a0f805142d42 100644 --- a/drivers/net/ethernet/ti/tlan.c +++ b/drivers/net/ethernet/ti/tlan.c @@ -610,8 +610,8 @@ static int tlan_probe1(struct pci_dev *pdev, long ioaddr, int irq, int rev, #ifdef CONFIG_PCI if (pdev) pci_release_regions(pdev); -#endif err_out: +#endif if (pdev) pci_disable_device(pdev); return rc;