ArmVirtPkg/QemuFwCfgLib: remove superfluous InternalQemuFwCfgIsAvailable()

InternalQemuFwCfgIsAvailable() is an API that is incorrectly exposed by
the "OvmfPkg/Include/Library/QemuFwCfgLib.h" library class header; the API
is meant to be used internally to library instances (if it's needed at
all). ArmVirtPkg's instance has no use for it actually, so simplify the
code and remove the function definition.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
index 8ecbe3fb5fe6f64d13d3e5e8f9795c31a8adf52b..2fd8d90505660e1226189b5f11dce0a347704e36 100644 (file)
--- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
+++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
@@ -74,25 +74,6 @@ typedef struct {
 #define FW_CFG_DMA_CTL_SELECT BIT3\r
 \r
 \r
-/**\r
-  Returns a boolean indicating if the firmware configuration interface is\r
-  available for library-internal purposes.\r
-\r
-  This function never changes fw_cfg state.\r
-\r
-  @retval TRUE   The interface is available internally.\r
-  @retval FALSE  The interface is not available internally.\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-InternalQemuFwCfgIsAvailable (\r
-  VOID\r
-  )\r
-{\r
-  return (BOOLEAN)(mFwCfgSelectorAddress != 0 && mFwCfgDataAddress != 0);\r
-}\r
-\r
-\r
 /**\r
   Returns a boolean indicating if the firmware configuration interface\r
   is available or not.\r
@@ -109,7 +90,7 @@ QemuFwCfgIsAvailable (
   VOID\r
   )\r
 {\r
-  return InternalQemuFwCfgIsAvailable ();\r
+  return (BOOLEAN)(mFwCfgSelectorAddress != 0 && mFwCfgDataAddress != 0);\r
 }\r
 \r
 \r
@@ -187,7 +168,7 @@ QemuFwCfgInitialize (
     FwCfgDmaAddress = 0;\r
   }\r
 \r
-  if (InternalQemuFwCfgIsAvailable ()) {\r
+  if (QemuFwCfgIsAvailable ()) {\r
     UINT32 Signature;\r
 \r
     QemuFwCfgSelectItem (QemuFwCfgItemSignature);\r
@@ -231,7 +212,7 @@ QemuFwCfgSelectItem (
   IN FIRMWARE_CONFIG_ITEM QemuFwCfgItem\r
   )\r
 {\r
-  if (InternalQemuFwCfgIsAvailable ()) {\r
+  if (QemuFwCfgIsAvailable ()) {\r
     MmioWrite16 (mFwCfgSelectorAddress, SwapBytes16 ((UINT16)QemuFwCfgItem));\r
   }\r
 }\r
@@ -360,7 +341,7 @@ QemuFwCfgReadBytes (
   IN VOID  *Buffer\r
   )\r
 {\r
-  if (InternalQemuFwCfgIsAvailable ()) {\r
+  if (QemuFwCfgIsAvailable ()) {\r
     InternalQemuFwCfgReadBytes (Size, Buffer);\r
   } else {\r
     ZeroMem (Buffer, Size);\r
@@ -384,7 +365,7 @@ QemuFwCfgWriteBytes (
   IN VOID                   *Buffer\r
   )\r
 {\r
-  if (InternalQemuFwCfgIsAvailable ()) {\r
+  if (QemuFwCfgIsAvailable ()) {\r
     UINTN Idx;\r
 \r
     for (Idx = 0; Idx < Size; ++Idx) {\r
@@ -494,7 +475,7 @@ QemuFwCfgFindFile (
   UINT32 Count;\r
   UINT32 Idx;\r
 \r
-  if (!InternalQemuFwCfgIsAvailable ()) {\r
+  if (!QemuFwCfgIsAvailable ()) {\r
     return RETURN_UNSUPPORTED;\r
   }\r
 \r