From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B2B81E00B6 for ; Fri, 11 Oct 2024 22:51:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728687121; cv=none; b=t7ePCgbgDqdoC6i0bvosDT2ZtKZBuKgrgf/g14gz+TzY2Xn8n4Lb6PvUWJMExvbE/fw8fLeZPZq/iceT4lZUxFL1yLRHzf11b66xfYch4W27mXEnq4qbCcwh447wmnzCO9U8aBEMxwii2AvMDY0drOa/8TE5PodzXC7MSzXrGNI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728687121; c=relaxed/simple; bh=IoOQ/r0ZEvEc+eVi8klNZRLpo3c1DnP5rtosTnOlVsM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hw4Fk9b1KG6lSw1+P1GL0uOy5Q66ud7H3RXyrvOseCiMlijOPcs98WTzTO2PrjagKZGw/C86dXQ29EhQWULJtW5QJx5ZcAZHmLiPY3sYPqEpdGnFZLLfKIqWfqt29SmYX1TqbOdltXvU3l3nWDAv9U6uQQizL1noiXj2mjjeT3A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=marek.ca; spf=pass smtp.mailfrom=marek.ca; dkim=pass (2048-bit key) header.d=marek.ca header.i=@marek.ca header.b=aXMGFVlw; arc=none smtp.client-ip=209.85.160.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=marek.ca Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marek.ca Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marek.ca header.i=@marek.ca header.b="aXMGFVlw" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-46037b5f4a8so23625631cf.0 for ; Fri, 11 Oct 2024 15:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek.ca; s=google; t=1728687117; x=1729291917; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hs8i3hJKqoLYVeCM0Bl+MtsW82Opz2gCCGdl6r+uwhk=; b=aXMGFVlwhTzLJI/Ke7f7CIJOANQLsKA3sbKwoRdL7FE3hZjjETaEChgXfct3cnEfg2 zWTGiw/5uWMYU0VfMdVc9RjPdvuGSdYnw4NiBLTq71oisPkwEBEwFb8+uImyY5S70GEn vn3bEgNtaNAxV0cz2aMpoaK+0OtbR9GxoOSf1ct0McWu79g6B7du76rB+ZOO/vD+da1V nRGEBSSb2CSn1R7TFwkawwhMR6/O6zz/+BX5cALCWPfipK51XyY329v2cgXOGYhuu71l OkNhWVlFZQP/X02h3sD2qgbOSeBVUbZ4+zzaYcnEPoVhFKQTp0bTAiSx3ojEtOyTTpt4 fINQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728687117; x=1729291917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hs8i3hJKqoLYVeCM0Bl+MtsW82Opz2gCCGdl6r+uwhk=; b=CLcgcUTPZ0Zh0g2zAtHCON9bnOp7rujbgb5yl470RWxcTW0XxG10YM9MVQCkHqPQ0M lKBGpIpQTALBAfZ+sLr1qdSwDDJtiMaCfHdRVvMPStP7YULw2/igLOqRorvb+rHxhaQP 2krVaPdlZOdcg0auYW0v+gKXDZvHvpeBDwCV66NCJr5sHy/BxsMnhTei/ojnrfo3Lkld rBb6kDa7sBJMtxEHNVtN1DeBILoK9E9m9P8n1g3KPd+eufR1o+dfmIoZf2qeqQr/jCN4 olovuZZBCiZqlMZlZspCFkb/aF0ftEvVXhP2VeDXB9CJoBN8JqtWPn62aAC7diwR423M MQjA== X-Forwarded-Encrypted: i=1; AJvYcCX76fG5N525/V4XtGGDXSvOo7L6w1lKSDxz5H5Th+MWD5zc9b7VaX+naCfakKa7BApSmcaOkFv7u6ffAb4=@vger.kernel.org X-Gm-Message-State: AOJu0YxQP8NFZDDKT2Kz8MULALxFEgNaEDR/rA/lYeOKR35TXHj4wbzO 0DKBFY6e1fEV/NC7x+ftYDEjYzJfrnN7e4eqMbyr0dtwl8d2hZ/Zbo3S/PLUFysJbLMcnPsNnCG BdRs= X-Google-Smtp-Source: AGHT+IGfcKfQvAo494+ULnaOqrFgouyNS9uXORG9tlC9J5V/tWbUOfuk02kfyO6Euv6sX/AQWC9nhw== X-Received: by 2002:a05:620a:44c2:b0:7a9:a991:f6d7 with SMTP id af79cd13be357-7b11a3ad395mr522173485a.48.1728687117226; Fri, 11 Oct 2024 15:51:57 -0700 (PDT) Received: from localhost.localdomain (modemcable125.110-19-135.mc.videotron.ca. [135.19.110.125]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b1149893basm176499585a.134.2024.10.11.15.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 15:51:56 -0700 (PDT) From: Jonathan Marek To: linux-efi@vger.kernel.org Cc: Ard Biesheuvel , Kuppuswamy Sathyanarayanan , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/3] efi/libstub: remove uneccessary cmdline_size init/check Date: Fri, 11 Oct 2024 18:48:01 -0400 Message-ID: <20241011224812.25763-2-jonathan@marek.ca> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20241011224812.25763-1-jonathan@marek.ca> References: <20241011224812.25763-1-jonathan@marek.ca> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit efi_convert_cmdline() always sets cmdline_size to at least 1 on success, so both the initialization to 0 and > 0 comparison are unecessary. Signed-off-by: Jonathan Marek --- drivers/firmware/efi/libstub/efi-stub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/libstub/efi-stub.c b/drivers/firmware/efi/libstub/efi-stub.c index 709ae2d41a632..f166614ef8432 100644 --- a/drivers/firmware/efi/libstub/efi-stub.c +++ b/drivers/firmware/efi/libstub/efi-stub.c @@ -112,7 +112,7 @@ static u32 get_supported_rt_services(void) efi_status_t efi_handle_cmdline(efi_loaded_image_t *image, char **cmdline_ptr) { - int cmdline_size = 0; + int cmdline_size; efi_status_t status; char *cmdline; @@ -137,7 +137,7 @@ efi_status_t efi_handle_cmdline(efi_loaded_image_t *image, char **cmdline_ptr) } } - if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_size > 0) { + if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) { status = efi_parse_options(cmdline); if (status != EFI_SUCCESS) { efi_err("Failed to parse options\n"); -- 2.45.1