ArmPkg: Update OemGetChassisType function to return MISC_CHASSIS_TYPE

Update OemGetChassisType in OemMiscLib to return MISC_CHASSIS_TYPE
instead of EFI_STATUS, which matches other OemMiscLib functions.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

3 files changed, 8 insertions, 39 deletions

diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/OemMiscLib.h
index d1ac81f73d..6dcc76a214 100644
--- a/ArmPkg/Include/Library/OemMiscLib.h
+++ b/ArmPkg/Include/Library/OemMiscLib.h
@@ -128,14 +128,12 @@ OemGetMaxProcessors (
 

 /** Gets the type of chassis for the system.

 

-  @param ChassisType The type of the chassis.

-

-  @retval EFI_SUCCESS The chassis type was fetched successfully.

+  @retval The type of the chassis.

 **/

-EFI_STATUS

+MISC_CHASSIS_TYPE

 EFIAPI

 OemGetChassisType (

-  OUT UINT8 *ChassisType

+  VOID

   );

 

 /** Returns whether the specified processor is present or not.

diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c
index 5153c9d780..21f106f1e0 100644
--- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c
+++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c
@@ -95,19 +95,16 @@ OemGetMaxProcessors (
 

 /** Gets the type of chassis for the system.

 

-  @param ChassisType The type of the chassis.

-

-  @retval EFI_SUCCESS The chassis type was fetched successfully.

+  @retval The type of the chassis.

 **/

-EFI_STATUS

+MISC_CHASSIS_TYPE

 EFIAPI

 OemGetChassisType (

-  UINT8 *ChassisType

+  VOID

   )

 {

   ASSERT (FALSE);

-  *ChassisType = MiscChassisTypeUnknown;

-  return EFI_SUCCESS;

+  return MiscChassisTypeUnknown;

 }

 

 /** Returns whether the specified processor is present or not.

diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
index e6adbceba2..fc4dba319a 100644
--- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
+++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
@@ -24,27 +24,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 makes boot time changes to the contents of the

   MiscChassisManufacturer (Type 3) record.

 

@@ -80,8 +59,6 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer)
   CONTAINED_ELEMENT               ContainedElements;

   UINT8                           ExtendLength;

 

-  UINT8                           ChassisType;

-

   ExtendLength = 0;

 

   //

@@ -165,10 +142,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer)
 

   SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE3) + ExtendLength + 1;

 

-  ChassisType = GetChassisType ();

-  if (ChassisType != 0) {

-    SmbiosRecord->Type  = ChassisType;

-  }

+  SmbiosRecord->Type = OemGetChassisType ();

 

   //ContainedElements

   ASSERT (ContainedElementCount < 2);