From nobody Fri Oct 3 21:00:33 2025 Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4665B2FF178 for ; Mon, 25 Aug 2025 16:07:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.136.65.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756138045; cv=none; b=FOSVPOfO//75VAtd6Dn5asUrADHoi4gulCf+A7McbnlwVNj6uDsilmLeD1YojEx15sQHkTYLPT5SuQELdek5pYbD3dUe6/SbEeUZSR/Zv3zI0qoAg2cz/6sHv6S64p/i/P4jwIVynPbe59XHrJNfjohFd5dOlUgvdfXEGKnSZaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756138045; c=relaxed/simple; bh=kpzwl5IixJTTR7SL4KsQpvxb2UynofWpn8JGb06Evqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y6G40Ltd4W9DJI4asgrLMbU3WfCSyWMrCeZnRQx02+9mCN3zUQnGnHZ/7d9uWOsOm6Uc4Qts/QBSZ2wkkcN/xZ5DkAbgHUd+Q7L5YsrL/et/NNSBIKOHok33WmL9gfrKqltRBuGtW7TjxYUuEoY4g2DJKSgNP6L2VhiPioq/RRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com; dkim=pass (2048-bit key) header.d=siemens.com header.i=jan.kiszka@siemens.com header.b=R2QDwQu8; arc=none smtp.client-ip=185.136.65.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=siemens.com header.i=jan.kiszka@siemens.com header.b="R2QDwQu8" Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20250825160714b4fd4a02425f2b9779 for ; Mon, 25 Aug 2025 18:07:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=rYRCF2IHsVpvuY/p1tdPnQYMO1M8HGQtME3DH/UxGlw=; b=R2QDwQu8GqUnA/IRd22zMQvb4DYZA77YDsUuZly3GymMQdYOwHQzKSx8cAgsDdbhJp4wD7 OM1Qxekm34fRKYeHcHjj49EP3MVKnW5SRVC/kadASQi/7PhL32itEoLJCbORUbnWKi/kXqEa t7hUpB8Mzjx2XpNC0C5JIi2nlP8PKUtKRL+YU+UyL/aI0aKFTGelxPiJB/7tQR1CPpa5U9Sg ulmOxxRmOEmzUpxBUfc93Ihl6akmWNeLrMdZoGNZMHD0pCsaqtB+ICUpMD871quu7HEsjzi6 nPhlsxzBnbFwPvmDM0sJ7B2feGQLX48psd8v3rFwHaV6EkgfS6HqIOlg==; From: Jan Kiszka To: Ard Biesheuvel , Masahisa Kojima , Ilias Apalodimas Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Sumit Garg , Jens Wiklander , Hua Qian Li Subject: [PATCH v3 3/4] efi: stmm: Drop unused EFI error from setup_mm_hdr arguments Date: Mon, 25 Aug 2025 18:07:12 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer Content-Type: text/plain; charset="utf-8" From: Jan Kiszka No caller ever evaluates what we return in 'ret'. They only use the return code of the function. Signed-off-by: Jan Kiszka Reviewed-by: Ilias Apalodimas --- drivers/firmware/efi/stmm/tee_stmm_efi.c | 25 ++++++++---------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/firmware/efi/stmm/tee_stmm_efi.c b/drivers/firmware/ef= i/stmm/tee_stmm_efi.c index 8501056ade8a..c2bc8467b099 100644 --- a/drivers/firmware/efi/stmm/tee_stmm_efi.c +++ b/drivers/firmware/efi/stmm/tee_stmm_efi.c @@ -154,11 +154,9 @@ static efi_status_t mm_communicate(u8 *comm_buf, size_= t payload_size) * @dptr: pointer address to store allocated buffer * @payload_size: payload size * @func: standAloneMM function number - * @ret: EFI return code * Return: pointer to corresponding StandAloneMM function buffer or NULL */ -static void *setup_mm_hdr(u8 **dptr, size_t payload_size, size_t func, - efi_status_t *ret) +static void *setup_mm_hdr(u8 **dptr, size_t payload_size, size_t func) { const efi_guid_t mm_var_guid =3D EFI_MM_VARIABLE_GUID; struct efi_mm_communicate_header *mm_hdr; @@ -173,16 +171,13 @@ static void *setup_mm_hdr(u8 **dptr, size_t payload_s= ize, size_t func, if (max_buffer_size && max_buffer_size < (MM_COMMUNICATE_HEADER_SIZE + MM_VARIABLE_COMMUNICATE_SIZE + payload_size)) { - *ret =3D EFI_INVALID_PARAMETER; return NULL; } =20 comm_buf =3D alloc_pages_exact(COMM_BUF_SIZE(payload_size), GFP_KERNEL | __GFP_ZERO); - if (!comm_buf) { - *ret =3D EFI_OUT_OF_RESOURCES; + if (!comm_buf) return NULL; - } =20 mm_hdr =3D (struct efi_mm_communicate_header *)comm_buf; memcpy(&mm_hdr->header_guid, &mm_var_guid, sizeof(mm_hdr->header_guid)); @@ -192,7 +187,6 @@ static void *setup_mm_hdr(u8 **dptr, size_t payload_siz= e, size_t func, var_hdr->function =3D func; if (dptr) *dptr =3D comm_buf; - *ret =3D EFI_SUCCESS; =20 return var_hdr->data; } @@ -215,8 +209,7 @@ static efi_status_t get_max_payload(size_t *size) =20 payload_size =3D sizeof(*var_payload); var_payload =3D setup_mm_hdr(&comm_buf, payload_size, - SMM_VARIABLE_FUNCTION_GET_PAYLOAD_SIZE, - &ret); + SMM_VARIABLE_FUNCTION_GET_PAYLOAD_SIZE); if (!var_payload) return EFI_DEVICE_ERROR; =20 @@ -262,7 +255,7 @@ static efi_status_t get_property_int(u16 *name, size_t = name_size, =20 smm_property =3D setup_mm_hdr( &comm_buf, payload_size, - SMM_VARIABLE_FUNCTION_VAR_CHECK_VARIABLE_PROPERTY_GET, &ret); + SMM_VARIABLE_FUNCTION_VAR_CHECK_VARIABLE_PROPERTY_GET); if (!smm_property) return EFI_DEVICE_ERROR; =20 @@ -318,7 +311,7 @@ static efi_status_t tee_get_variable(u16 *name, efi_gui= d_t *vendor, =20 payload_size =3D MM_VARIABLE_ACCESS_HEADER_SIZE + name_size + tmp_dsize; var_acc =3D setup_mm_hdr(&comm_buf, payload_size, - SMM_VARIABLE_FUNCTION_GET_VARIABLE, &ret); + SMM_VARIABLE_FUNCTION_GET_VARIABLE); if (!var_acc) return EFI_DEVICE_ERROR; =20 @@ -383,8 +376,7 @@ static efi_status_t tee_get_next_variable(unsigned long= *name_size, =20 payload_size =3D MM_VARIABLE_GET_NEXT_HEADER_SIZE + out_name_size; var_getnext =3D setup_mm_hdr(&comm_buf, payload_size, - SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME, - &ret); + SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME); if (!var_getnext) return EFI_DEVICE_ERROR; =20 @@ -440,7 +432,7 @@ static efi_status_t tee_set_variable(efi_char16_t *name= , efi_guid_t *vendor, * the properties, if the allocation fails */ var_acc =3D setup_mm_hdr(&comm_buf, payload_size, - SMM_VARIABLE_FUNCTION_SET_VARIABLE, &ret); + SMM_VARIABLE_FUNCTION_SET_VARIABLE); if (!var_acc) return EFI_DEVICE_ERROR; =20 @@ -495,8 +487,7 @@ static efi_status_t tee_query_variable_info(u32 attribu= tes, =20 payload_size =3D sizeof(*mm_query_info); mm_query_info =3D setup_mm_hdr(&comm_buf, payload_size, - SMM_VARIABLE_FUNCTION_QUERY_VARIABLE_INFO, - &ret); + SMM_VARIABLE_FUNCTION_QUERY_VARIABLE_INFO); if (!mm_query_info) return EFI_DEVICE_ERROR; =20 --=20 2.43.0