From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by mx.groups.io with SMTP id smtpd.web08.35931.1614004419515968612 for ; Mon, 22 Feb 2021 06:33:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=DDchV/pw; spf=pass (domain: nuviainc.com, ip: 209.85.210.42, mailfrom: rebecca@nuviainc.com) Received: by mail-ot1-f42.google.com with SMTP id k13so1598158otn.13 for ; Mon, 22 Feb 2021 06:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=SuBwYmZ8YatgPSMYtdVRDsdhAI7gJaPh0QVnZcRITgw=; b=DDchV/pw9BPC+Pqdu8X//tCS0JdS0AEtRxSqV4fRCEFqJCakH/gho7jfU4/tnNMNLn l9WvUiyWsK/C+2RXexaNahvvq3D01DARVFx6WNRR4RZObVBDHWfgnLRHiwDsYBjaoopX HWs+WPFf+PwOF7tb8VbfAKPR0UWCQiTwsQqKD73ungh6kKkFm+3N2uDze+vH5xMp5bOv 7BhCPgBUBLa4LWquISn+iAJXzvMsng2DZzV2ihVlSFe4U5AfgrtvUYz49eODWwQNabkU 6+puYj6qO/x4v12QEQYRSWyAvQfIAwklbCm/eK2pDPfOj1g5Reccu37prkvVjJapAPA1 oFww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=SuBwYmZ8YatgPSMYtdVRDsdhAI7gJaPh0QVnZcRITgw=; b=QmJbY3U6Nhv3xheto/vYf8Q/FV20HKmQueO/rb8bDLKzt1Ob/TMIu4SFnE99IK4HS2 fqL1o2/Eo9SrkgmuHlvtxKxHuURx7nIRdr5W9P2mOY0/qyrKOZUjjlYIKWCTT78q9j9Z 3dijpxUI5cTwJDx/kmGl47ez99RbBCop2Im/YWPdkgqVdNuR1EoE1YNjeVN9gbm6ovuc Fex1XFMmS4VvKYRRBcqrheV0biF6D3zhHhM2mYvy/uhigIfzmDUpzT0grBnRgivB0jE6 DRFln/NdSPx5ZasklI7oHLxPfj3brwdHikztWMulZ/0QIJnwc6GgiEqLMpFzDLYhULFc IQXA== X-Gm-Message-State: AOAM533lAAhG302i27DcaMctW2giK5D+2N4pThViIJg0YROct0yavTeM YgPWqhrU7SQhoqRpW2XrGOWBTg== X-Google-Smtp-Source: ABdhPJxJYQKoPpQlMkghMffZARRkJ5ooSNRNwZ5aL1FBqGoRBXx4aOf8jznNAtaNTfS2/xsYORKbrA== X-Received: by 2002:a05:6830:1f3c:: with SMTP id e28mr17160989oth.93.1614004418883; Mon, 22 Feb 2021 06:33:38 -0800 (PST) Return-Path: Received: from [10.0.10.142] (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id l25sm3788856otd.40.2021.02.22.06.33.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Feb 2021 06:33:38 -0800 (PST) Subject: Re: [PATCH v2 2/3] ArmPkg: Rename some functions and parameters in OemMiscLib To: Leif Lindholm Cc: devel@edk2.groups.io, Ard Biesheuvel References: <20210221032900.6485-1-rebecca@nuviainc.com> <20210221032900.6485-3-rebecca@nuviainc.com> <20210221212153.GO1664@vanye> <60e89245-a027-d082-9ece-bc9fed791583@nuviainc.com> <20210222123521.GR1664@vanye> From: "Rebecca Cran" Message-ID: Date: Mon, 22 Feb 2021 07:33:37 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210222123521.GR1664@vanye> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 2/22/21 5:35 AM, Leif Lindholm wrote: > On Sun, Feb 21, 2021 at 16:04:31 -0700, Rebecca Cran wrote: >> On 2/21/21 2:21 PM, Leif Lindholm wrote: >>> On Sat, Feb 20, 2021 at 20:28:59 -0700, Rebecca Cran wrote: > > (Adding necessary patch context back in - please don't strip out until > absolutely certain it is irrelevant to conversation.) > > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > index e6adbceba2d5..fc4dba319aad 100644 > --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > @@ -23,27 +23,6 @@ > > #include "SmbiosMisc.h" > > -/** > - * Returns the chassis type in SMBIOS format. > - * > - * @return Chassis type > -**/ > >>>> -UINT8 >>>> -GetChassisType ( >>>> - VOID >>>> - ) >>>> -{ >>>> - EFI_STATUS Status; >>>> - UINT8 ChassisType; >>>> - >>>> - Status = OemGetChassisType (&ChassisType); >>>> - if (EFI_ERROR (Status)) { >>>> - return 0; >>>> - } >>>> - >>>> - return ChassisType; >>>> -} >>>> - >>> >>> This function is outright deleted, not renamed. >>> Does this belong in another patch? >> >> I think it belongs here: it was just a helper function for when >> OemGetChassisType returned EFI_STATUS. Since it now returns the same data as >> this function, we don't need it anymore. > > This patch, according to its title and commit message, does renaming. > > The refactoring should then be moved over to 3/3, together with this > hunk: > > @@ -165,10 +142,7 @@ > SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) > > SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE3) + SmbiosRecord->ExtendLength + 1; > > - ChassisType = GetChassisType (); > - if (ChassisType != 0) { > - SmbiosRecord->Type = ChassisType; > - } > + SmbiosRecord->Type = OemGetChassisType (); > > //ContainedElements > ASSERT (ContainedElementCount < 2); > > The current layout means this code (in 2/3) relies on the API change > introduced in 3/3. Sorry - I did catch this before sending the series but apparently forgot to regenerate the set. I agree, this breaks bisection and needs moved to 3/3. -- Rebecca Cran