Received: by 10.223.185.116 with SMTP id b49csp1135580wrg; Fri, 23 Feb 2018 12:33:40 -0800 (PST) X-Google-Smtp-Source: AH8x224MlVs13yM4VWbgV2BwCr7oUuzlK79dHmDaTTj6V3Tw2s2izDWv/YNuE5bQEB2ZMMpX6TMB X-Received: by 2002:a17:902:14cb:: with SMTP id y11-v6mr2842363plg.294.1519418020152; Fri, 23 Feb 2018 12:33:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519418020; cv=none; d=google.com; s=arc-20160816; b=m/eBsOd/ixo2wrOlE5BhXRpqtnTcAvP1JsJMVohAR/RUivKLG85/W4az13xjAKxzsn x75ED2buRqH/oEqa/JVaNwzEeIIoDs/1zGT1CCoslbiKUhxIIq9Ik/D09y2ZlRDIl86x GFf2pHmGwE+hFvhMoOHr92Qk/7Tg8eNHumFto7jmsao/Slp1hzMGTA/WLSQ0XP+/cRYw nrjxYSgT/zfqeS3/TEgr97kdwnlr6CpRSXGK9lHHTJxmHr15lxBvgHvQmMsz7fL6VGkj Cf3c5xISo2JJjYpA6oqL3Z0jduW8EVhB6u77+XGdDdGlzK3PuZ5luZYujS5G4kBaYu9R EW0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=c5LArvcBMsmXgSSZtyFqh1SC+8flvr8XAWOsxcEOW1A=; b=vTheytmvFCmQWFl9zmheTw/aq/GEmwb8CN1b7HOs7SsDK/uZXjJ+xSxQh627pu9fVK wZGM+j9MoATfnlfjmRdJNXEEDrZdk5d7AQkz3kaAyl8aRByuB+shKmuZ2Y6K2/dUxX/5 YfpD2Sh3f2NIjHVbPSrPpaiNmFfoqvCpBb1dsRN2qPxt+QCG+EeqJgMSQLrYCFivf/lC iJ613TBu+aVfTQUkN5pk7FYVgG/F3aduJ8nv9eEX6mfhoQR7Gd1TdSU0gUKoEaYLCaqz fUZNmIMWOcv8DlO8+xEu4pLNwLrfkDFsTgqq4wv95Ylu3v8EhJxzS51HG/ZfVuVDM/Df 4O1g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a62si1939149pgc.70.2018.02.23.12.33.25; Fri, 23 Feb 2018 12:33:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753903AbeBWSfv (ORCPT + 99 others); Fri, 23 Feb 2018 13:35:51 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37436 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752919AbeBWSft (ORCPT ); Fri, 23 Feb 2018 13:35:49 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id D359112D3; Fri, 23 Feb 2018 18:35:48 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Florian Tobias Schandinat , Bartlomiej Zolnierkiewicz Subject: [PATCH 4.4 067/193] video: fbdev: via: remove possibly unused variables Date: Fri, 23 Feb 2018 19:25:00 +0100 Message-Id: <20180223170336.473005962@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann commit 484c7bbf2649831714da3a0fa30213977458e9b5 upstream. 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: Greg Kroah-Hartman --- drivers/video/fbdev/via/viafbdev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- 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 } 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);