From patchwork Thu Mar 1 15:27:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130278 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952033edc; Thu, 1 Mar 2018 07:38:14 -0800 (PST) X-Google-Smtp-Source: AG47ELsB/kQ5rY0WyOKbRkgiilmO2WVPR0DiuPE41Q3QlTK/r2N6rtOSsdmpMWQip8xDlVZfvO3n X-Received: by 10.98.11.145 with SMTP id 17mr2368096pfl.150.1519918693930; Thu, 01 Mar 2018 07:38:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918693; cv=none; d=google.com; s=arc-20160816; b=qtsnxUjZUPvZhISMee0afCcmNOOT5377lnwsJwZLn0E9ncZmwc7AqgnUH7xSDGZE5o rFlkIoucrof1/BE4jtIR/A2Hdo2NLaUVDjdbBTl5em2ackA/zs3qtqh/8ENNzz+vif56 ITl1Yk4hN7u4grNvsTLE28tFR1PpOpn/QKP3NDkRw6l675PAf7UJZtm8l4j94u+qCz3k irVuDAzdHkUXgRhtlXAqmEf30ExEomXZQzVYCsw+ILFJrAkX7O8RhBWv+Mv79QpDqWnR xguV5v+D2XkLS1qPQObOviSaHNBOJUHP+dVLFPU0lZsD33663GZ3hGL+bi3ztl0RDwtL WXzw== 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=8h3SEO60uwoCbXXONU9ya6MdTEtB1ox2TdvJGuzFLHk=; b=LxCesZeHKt7JHcEoWRnQQiohbvFNzWwEA+0/u/lNrqhIhN1rCFXUhJSrMLnLmmHPtg /UR8EzU118H4OSwsf79Bl14R67srTsR+Bl6vcu6A0BF6+3uQ1+7axQkehaxNuhlnguo2 n8lV6QICeAgalpxJqrBfXXiRIskrAb1RdWKqWIFBHfDyvdZH+DrprcY1pjC6O0W5hcuc b9Ew48USdUlXcjuJR2ZBsaLai5avW8f1apf7SESNtxMTK83TjIuSeD1WN4Cj5dF4QsaN DSxXh0Qno8RUFZRlxIJQa/C9MBkNUpf5h4ycEXPH2lKvV9Qy0bpW8UZWzlRA+Y6FtHb2 ljBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=EEM8dtTP; 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 d24-v6si3165005plr.615.2018.03.01.07.38.13; Thu, 01 Mar 2018 07:38:13 -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=EEM8dtTP; 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 S1032448AbeCAPiK (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:10 -0500 Received: from mail-cys01nam02on0129.outbound.protection.outlook.com ([104.47.37.129]:45715 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032523AbeCAPhp (ORCPT ); Thu, 1 Mar 2018 10:37:45 -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=8h3SEO60uwoCbXXONU9ya6MdTEtB1ox2TdvJGuzFLHk=; b=EEM8dtTPr9gogwCxasjQT4hQ6zviAeJrZ1BN9n/h/Fdvn4oxpd4BluEjkDCE9ERFzqG4r169u4HISpjVDibB5lz/jLwRQzXkYqM2pjJAn+lRxKyqpL7wPyInPCXCcGUMpSl9aBoCvLfGWOvFXQU3+oUwctp2jX0VMnBCCczkJ2k= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1014.namprd21.prod.outlook.com (52.132.133.36) 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:37:39 +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:37:39 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [added to the 4.1 stable tree] video: fbdev: via: remove possibly unused variables Thread-Topic: [added to the 4.1 stable tree] video: fbdev: via: remove possibly unused variables Thread-Index: AQHTsXHC+IHta6pGrUSZ67sol0/iFA== Date: Thu, 1 Mar 2018 15:27:07 +0000 Message-ID: <20180301152116.1486-432-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; DM5PR2101MB1014; 7:WFTDq0s1laQrLgBHI3EagnWH61dF1wZjE8Bd/T+tnIXqRsR845T58Zi76uc1LnHfIul26O+SFpcjMplCssnthHRmtLggyssA7M6kTPrIpI5KGL9Xbo2DoP3tsUEQGIErtYb9PUMDaJleMGt5v9+A4iyg40jxo/QRwUvR0hclfeK6Rpk/NaQcaoJzqgpQ8EQPk2xW/TLfOIVkVYU8t6GShe7pUfLefYvJGNHv5bWNEQ5Hl7Bm49mpgMKxPeM134O0 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9bcb2e5d-4117-407b-d707-08d57f8a5d9a x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1014; x-ms-traffictypediagnostic: DM5PR2101MB1014: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(26323138287068)(89211679590171)(7411616537696); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501228)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1014; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1014; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(346002)(39860400002)(376002)(396003)(199004)(189003)(53936002)(2906002)(3280700002)(6436002)(6486002)(3846002)(6512007)(2900100001)(6116002)(2950100002)(107886003)(6666003)(72206003)(5660300001)(36756003)(10090500001)(3660700001)(14454004)(7736002)(305945005)(97736004)(1076002)(22452003)(26005)(6506007)(105586002)(86362001)(575784001)(59450400001)(478600001)(68736007)(102836004)(4326008)(6346003)(54906003)(110136005)(81156014)(81166006)(86612001)(8936002)(186003)(10290500003)(8676002)(76176011)(316002)(2501003)(66066001)(25786009)(5250100002)(106356001)(99286004)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1014; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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: JXRHzKbZJArhDa5788PCDKlAjYI4JBQSAsQ+tHYsV8eBOfKhW3Eh8nEQGXt2sbYtps87xAIxiNAvWISxQtQYhqH/yhTpKqQ6yHaA+ukWBg5+Dxg2QV3WsR4+LBAOS9ZKmvXxYRCN7U40XORtQtcDmqd+P171TCQcYdoZmkxwtYY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bcb2e5d-4117-407b-d707-08d57f8a5d9a X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:07.1749 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1014 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 484c7bbf2649831714da3a0fa30213977458e9b5 ] When CONFIG_PROC_FS is disabled, we get warnings about unused variables as remove_proc_entry() evaluates to an empty macro. drivers/video/fbdev/via/viafbdev.c: In function 'viafb_remove_proc': drivers/video/fbdev/via/viafbdev.c:1635:4: error: unused variable 'iga2_entry' [-Werror=unused-variable] drivers/video/fbdev/via/viafbdev.c:1634:4: error: unused variable 'iga1_entry' [-Werror=unused-variable] These are easy to avoid by using the pointer from the structure. Signed-off-by: Arnd Bergmann Cc: Florian Tobias Schandinat Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/via/viafbdev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/via/viafbdev.c b/drivers/video/fbdev/via/viafbdev.c index f9718f012aae..badee04ef496 100644 --- a/drivers/video/fbdev/via/viafbdev.c +++ b/drivers/video/fbdev/via/viafbdev.c @@ -1630,16 +1630,14 @@ static void viafb_init_proc(struct viafb_shared *shared) } static void viafb_remove_proc(struct viafb_shared *shared) { - struct proc_dir_entry *viafb_entry = shared->proc_entry, - *iga1_entry = shared->iga1_proc_entry, - *iga2_entry = shared->iga2_proc_entry; + struct proc_dir_entry *viafb_entry = shared->proc_entry; if (!viafb_entry) return; - remove_proc_entry("output_devices", iga2_entry); + remove_proc_entry("output_devices", shared->iga2_proc_entry); remove_proc_entry("iga2", viafb_entry); - remove_proc_entry("output_devices", iga1_entry); + remove_proc_entry("output_devices", shared->iga1_proc_entry); remove_proc_entry("iga1", viafb_entry); remove_proc_entry("supported_output_devices", viafb_entry);