Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp598636ybz; Fri, 24 Apr 2020 06:09:09 -0700 (PDT) X-Google-Smtp-Source: APiQypLJtSIKl/B72YyRJWcJSatr4qPKPRzfr0Va+lkDlUvfH2X1ZcLaL2p5orSqes/F8zYWNjt8 X-Received: by 2002:a50:ef09:: with SMTP id m9mr6917471eds.321.1587733749275; Fri, 24 Apr 2020 06:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587733749; cv=none; d=google.com; s=arc-20160816; b=Tm0lQSpXWz18K//f3QlAmtvGztzDDvkpJZlzletMt6FU/k3Bi7lq/9QQMX/9IaIfy+ vi08fFOoktetVL4D2t5SMz6GMnfYHxO9TJMGZfSvzqFevh/oPPJO36UbiUmCBzutsvng BIi2mBEYmjpyN+XU36dMq6FqTP1N6hzblcsTUioz/fS6V5b1sF1o7Uyje279QTDoF+mC GBzP5aoqmBjips6vcGQE5TtcHdMbTs6XJESTclxqG9yvXiKr8A9ZUiMofFKDaQvHmgzb Xy1NPp2lXpxU+XlhNWGMFNNlq3c/YhLQeJfP2hwK0fTTD7Cp/g0rCkLECh1Wgk9S5VPh 0irQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=8uXCJlsnh6I8HP9goTqCx3CV6dl+DkuRGadyrgeIJ7A=; b=Z353bkFWaDwysN7JoqAwZVqyLU3XFwOt+ar9ogeBYh39PQBN/AfQyPGxwmUwJTVALb T3hheS8V6eaelub639z5l+bEVxAMLSorOhxCbA2zEZlAZ+w+9mC2doD0tllM4qhG7VVq h2a2+n8Bnl9LJYXCSm7gzOjHc3VjMh1xdwPv9sxtCi7Vz+ZkJ898sLb8+JTDyirSBypw gyUrqwmqtWHm4aXkYVl/iVT/CXUVStZmJfrFmvoD/JfOMozNg86RyL6id2vUnHySbwb0 aSp/DthNSWtIt9kWHO+ARy1SlrhHkuxUndGihxItnZMpk2rSciMm5akQm/JEgkdNXFcJ akMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wzbFd25z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dd8si3400955ejb.486.2020.04.24.06.08.38; Fri, 24 Apr 2020 06:09:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wzbFd25z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727996AbgDXNGj (ORCPT + 99 others); Fri, 24 Apr 2020 09:06:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:57030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726954AbgDXNGe (ORCPT ); Fri, 24 Apr 2020 09:06:34 -0400 Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6E6CE2087E; Fri, 24 Apr 2020 13:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587733594; bh=yay0uhlPeCbb5DfEc5mFmXom1uk+kOvAdVyPNt6cF54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wzbFd25zAetEclcdoX0kwTQWtGxGmfKmhaWLjUn3DiuagH9hEEBDwzVf33cvJ0Lr6 LFqMrxCBz0Q+g3SDG85TSN+SFDVTcZq/qrEFPYEe9jplA+g/G7roxGyfcA8FR18aGS DlEEftcmrW23kLWKp68eQ8jYrTCMcjBbRygRt654= From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, Arvind Sankar , Atish Patra , Palmer Dabbelt , Zou Wei Subject: [PATCH 10/33] efi/gop: Move variable declarations into loop block Date: Fri, 24 Apr 2020 15:05:08 +0200 Message-Id: <20200424130531.30518-11-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200424130531.30518-1-ardb@kernel.org> References: <20200424130531.30518-1-ardb@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arvind Sankar Declare the variables inside the block where they're used. Get rid of a couple of redundant initializers. Signed-off-by: Arvind Sankar Link: https://lore.kernel.org/r/20200320020028.1936003-7-nivedita@alum.mit.edu Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/gop.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c index a7d3efe36c78..0d195060a370 100644 --- a/drivers/firmware/efi/libstub/gop.c +++ b/drivers/firmware/efi/libstub/gop.c @@ -88,16 +88,19 @@ setup_pixel_info(struct screen_info *si, u32 pixels_per_scan_line, static efi_graphics_output_protocol_t * find_gop(efi_guid_t *proto, unsigned long size, void **handles) { - efi_graphics_output_protocol_t *gop, *first_gop; - efi_graphics_output_protocol_mode_t *mode; - efi_graphics_output_mode_info_t *info = NULL; - efi_status_t status; + efi_graphics_output_protocol_t *first_gop; efi_handle_t h; int i; first_gop = NULL; for_each_efi_handle(h, handles, size, i) { + efi_status_t status; + + efi_graphics_output_protocol_t *gop; + efi_graphics_output_protocol_mode_t *mode; + efi_graphics_output_mode_info_t *info; + efi_guid_t conout_proto = EFI_CONSOLE_OUT_DEVICE_GUID; void *dummy = NULL; @@ -136,7 +139,7 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, { efi_graphics_output_protocol_t *gop; efi_graphics_output_protocol_mode_t *mode; - efi_graphics_output_mode_info_t *info = NULL; + efi_graphics_output_mode_info_t *info; efi_physical_addr_t fb_base; gop = find_gop(proto, size, handles); -- 2.17.1