MdeModulePkg: Update code to be more C11 compliant by using __func__

__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among
others support, while __func__ was standardized in C99.

Since it's more standard, replace __FUNCTION__ with __func__ throughout
MdeModulePkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

4 files changed, 50 insertions, 50 deletions

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.c b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.c
index 3e6f75345d..38f86487e2 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.c
@@ -91,7 +91,7 @@ EnumerateNvmeDevNamespace (
              NamespaceData

              );

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NvmeIdentifyNamespace fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NvmeIdentifyNamespace fail, Status - %r\n", __func__, Status));

     goto Exit;

   }

 

@@ -99,7 +99,7 @@ EnumerateNvmeDevNamespace (
   // Validate Namespace

   //

   if (NamespaceData->Ncap == 0) {

-    DEBUG ((DEBUG_INFO, "%a: Namespace ID %d is an inactive one.\n", __FUNCTION__, NamespaceId));

+    DEBUG ((DEBUG_INFO, "%a: Namespace ID %d is an inactive one.\n", __func__, NamespaceId));

     Status = EFI_DEVICE_ERROR;

     goto Exit;

   }

@@ -142,7 +142,7 @@ EnumerateNvmeDevNamespace (
   DEBUG ((

     DEBUG_INFO,

     "%a: Namespace ID %d - BlockSize = 0x%x, LastBlock = 0x%lx\n",

-    __FUNCTION__,

+    __func__,

     NamespaceId,

     NamespaceInfo->Media.BlockSize,

     NamespaceInfo->Media.LastBlock

@@ -246,14 +246,14 @@ NvmeInitPrivateData (
   PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;

   EFI_PHYSICAL_ADDRESS              DeviceAddress;

 

-  DEBUG ((DEBUG_INFO, "%a: Enters.\n", __FUNCTION__));

+  DEBUG ((DEBUG_INFO, "%a: Enters.\n", __func__));

 

   //

   // Get the current boot mode.

   //

   Status = PeiServicesGetBootMode (&BootMode);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: Fail to get the current boot mode.\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: Fail to get the current boot mode.\n", __func__));

     return Status;

   }

 

@@ -265,7 +265,7 @@ NvmeInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

       "%a: The device path is invalid.\n",

-      __FUNCTION__

+      __func__

       ));

     return Status;

   }

@@ -282,7 +282,7 @@ NvmeInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

       "%a: skipped during S3.\n",

-      __FUNCTION__

+      __func__

       ));

     return EFI_SUCCESS;

   }

@@ -295,7 +295,7 @@ NvmeInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Fail to allocate private data.\n",

-      __FUNCTION__

+      __func__

       ));

     return EFI_OUT_OF_RESOURCES;

   }

@@ -313,13 +313,13 @@ NvmeInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Fail to allocate DMA buffers.\n",

-      __FUNCTION__

+      __func__

       ));

     return Status;

   }

 

   ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS)(UINTN)Private->Buffer));

-  DEBUG ((DEBUG_INFO, "%a: DMA buffer base at 0x%x\n", __FUNCTION__, Private->Buffer));

+  DEBUG ((DEBUG_INFO, "%a: DMA buffer base at 0x%x\n", __func__, Private->Buffer));

 

   //

   // Initialize controller private data

@@ -337,7 +337,7 @@ NvmeInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Controller initialization fail with Status - %r.\n",

-      __FUNCTION__,

+      __func__,

       Status

       ));

     NvmeFreeDmaResource (Private);

@@ -355,7 +355,7 @@ NvmeInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Namespaces discovery fail with Status - %r.\n",

-      __FUNCTION__,

+      __func__,

       Status

       ));

     NvmeFreeDmaResource (Private);

@@ -414,7 +414,7 @@ NvmeInitPrivateData (
     DEBUG ((

       DEBUG_INFO,

       "%a: Security Security Command PPI will be produced.\n",

-      __FUNCTION__

+      __func__

       ));

     Private->StorageSecurityPpi.Revision           = EDKII_STORAGE_SECURITY_PPI_REVISION;

     Private->StorageSecurityPpi.GetNumberofDevices = NvmeStorageSecurityGetDeviceNo;

@@ -557,7 +557,7 @@ NvmeInitControllerDataFromPciDevice (
     DEBUG ((

       DEBUG_INFO,

       "%a: Failed to init controller, with Status - %r\n",

-      __FUNCTION__,

+      __func__,

       Status

       ));

   }

@@ -635,7 +635,7 @@ NvmeInitControllerFromHostControllerPpi (
       DEBUG ((

         DEBUG_ERROR,

         "%a: Fail to allocate get the device path for Controller %d.\n",

-        __FUNCTION__,

+        __func__,

         Controller

         ));

       return Status;

@@ -646,7 +646,7 @@ NvmeInitControllerFromHostControllerPpi (
       DEBUG ((

         DEBUG_ERROR,

         "%a: Controller initialization fail for Controller %d with Status - %r.\n",

-        __FUNCTION__,

+        __func__,

         Controller,

         Status

         ));

@@ -654,7 +654,7 @@ NvmeInitControllerFromHostControllerPpi (
       DEBUG ((

         DEBUG_INFO,

         "%a: Controller %d has been successfully initialized.\n",

-        __FUNCTION__,

+        __func__,

         Controller

         ));

     }

@@ -712,7 +712,7 @@ NvmExpressPeimEntry (
   IN CONST EFI_PEI_SERVICES  **PeiServices

   )

 {

-  DEBUG ((DEBUG_INFO, "%a: Enters.\n", __FUNCTION__));

+  DEBUG ((DEBUG_INFO, "%a: Enters.\n", __func__));

 

   PeiServicesNotifyPpi (&mNvmeHostControllerNotify);

 

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c
index 576481dcee..a61238086c 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c
@@ -125,14 +125,14 @@ NvmeRead (
       MaxTransferBlocks = MaxTransferBlocks >> 1;

 

       if ((Retries > NVME_READ_MAX_RETRY) || (MaxTransferBlocks < 1)) {

-        DEBUG ((DEBUG_ERROR, "%a: ReadSectors fail, Status - %r\n", __FUNCTION__, Status));

+        DEBUG ((DEBUG_ERROR, "%a: ReadSectors fail, Status - %r\n", __func__, Status));

         break;

       }

 

       DEBUG ((

         DEBUG_BLKIO,

         "%a: ReadSectors fail, retry with smaller transfer block number - 0x%x\n",

-        __FUNCTION__,

+        __func__,

         MaxTransferBlocks

         ));

       continue;

@@ -151,7 +151,7 @@ NvmeRead (
     DEBUG_BLKIO,

     "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "

     "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n",

-    __FUNCTION__,

+    __func__,

     Lba,

     (UINT64)OrginalBlocks,

     (UINT64)Blocks,

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiHci.c b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiHci.c
index bff5cfd0d5..fc7b684940 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiHci.c
@@ -138,7 +138,7 @@ NvmeBaseMemPageOffset (
   PageSizeList[4] = NVME_PRP_SIZE; /* PRPs */

 

   if (BaseMemIndex > MAX_BASEMEM_COUNT) {

-    DEBUG ((DEBUG_ERROR, "%a: The input BaseMem index is invalid.\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: The input BaseMem index is invalid.\n", __func__));

     ASSERT (FALSE);

     return 0;

   }

@@ -191,7 +191,7 @@ NvmeWaitController (
     //

     Status = NVME_GET_CSTS (Private, &Csts);

     if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "%a: NVME_GET_CSTS fail, Status - %r\n", __FUNCTION__, Status));

+      DEBUG ((DEBUG_ERROR, "%a: NVME_GET_CSTS fail, Status - %r\n", __func__, Status));

       return Status;

     }

 

@@ -232,7 +232,7 @@ NvmeDisableController (
   //

   Status = NVME_GET_CC (Private, &Cc);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NVME_GET_CC fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NVME_GET_CC fail, Status - %r\n", __func__, Status));

     goto ErrorExit;

   }

 

@@ -243,21 +243,21 @@ NvmeDisableController (
     //

     Status = NVME_SET_CC (Private, &Cc);

     if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "%a: NVME_SET_CC fail, Status - %r\n", __FUNCTION__, Status));

+      DEBUG ((DEBUG_ERROR, "%a: NVME_SET_CC fail, Status - %r\n", __func__, Status));

       goto ErrorExit;

     }

   }

 

   Status = NvmeWaitController (Private, FALSE);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NvmeWaitController fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NvmeWaitController fail, Status - %r\n", __func__, Status));

     goto ErrorExit;

   }

 

   return EFI_SUCCESS;

 

 ErrorExit:

-  DEBUG ((DEBUG_ERROR, "%a fail, Status - %r\n", __FUNCTION__, Status));

+  DEBUG ((DEBUG_ERROR, "%a fail, Status - %r\n", __func__, Status));

   return Status;

 }

 

@@ -289,20 +289,20 @@ NvmeEnableController (
   Cc.Iocqes = 4;

   Status    = NVME_SET_CC (Private, &Cc);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NVME_SET_CC fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NVME_SET_CC fail, Status - %r\n", __func__, Status));

     goto ErrorExit;

   }

 

   Status = NvmeWaitController (Private, TRUE);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NvmeWaitController fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NvmeWaitController fail, Status - %r\n", __func__, Status));

     goto ErrorExit;

   }

 

   return EFI_SUCCESS;

 

 ErrorExit:

-  DEBUG ((DEBUG_ERROR, "%a fail, Status: %r\n", __FUNCTION__, Status));

+  DEBUG ((DEBUG_ERROR, "%a fail, Status: %r\n", __func__, Status));

   return Status;

 }

 

@@ -572,7 +572,7 @@ NvmeControllerInit (
   //

   NVME_GET_CAP (Private, &Private->Cap);

   if ((Private->Cap.Css & BIT0) == 0) {

-    DEBUG ((DEBUG_ERROR, "%a: The NVME controller doesn't support NVMe command set.\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: The NVME controller doesn't support NVMe command set.\n", __func__));

     return EFI_UNSUPPORTED;

   }

 

@@ -580,7 +580,7 @@ NvmeControllerInit (
   // Currently, the driver only supports 4k page size

   //

   if ((Private->Cap.Mpsmin + 12) > EFI_PAGE_SHIFT) {

-    DEBUG ((DEBUG_ERROR, "%a: The driver doesn't support page size other than 4K.\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: The driver doesn't support page size other than 4K.\n", __func__));

     ASSERT (FALSE);

     return EFI_UNSUPPORTED;

   }

@@ -599,7 +599,7 @@ NvmeControllerInit (
   //

   Status = NvmeDisableController (Private);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NvmeDisableController fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NvmeDisableController fail, Status - %r\n", __func__, Status));

     return Status;

   }

 

@@ -647,7 +647,7 @@ NvmeControllerInit (
   //

   Status = NvmeEnableController (Private);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NvmeEnableController fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NvmeEnableController fail, Status - %r\n", __func__, Status));

     return Status;

   }

 

@@ -663,7 +663,7 @@ NvmeControllerInit (
 

   Status = NvmeIdentifyController (Private, Private->ControllerData);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NvmeIdentifyController fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NvmeIdentifyController fail, Status - %r\n", __func__, Status));

     return Status;

   }

 

@@ -676,7 +676,7 @@ NvmeControllerInit (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Number of Namespaces field in Identify Controller data not supported by the driver.\n",

-      __FUNCTION__

+      __func__

       ));

     return EFI_UNSUPPORTED;

   }

@@ -686,13 +686,13 @@ NvmeControllerInit (
   //

   Status = NvmeCreateIoCompletionQueue (Private);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: Create IO completion queue fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: Create IO completion queue fail, Status - %r\n", __func__, Status));

     return Status;

   }

 

   Status = NvmeCreateIoSubmissionQueue (Private);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: Create IO submission queue fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: Create IO submission queue fail, Status - %r\n", __func__, Status));

   }

 

   return Status;

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiPassThru.c b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiPassThru.c
index dc280ec4e3..5081b53cd5 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiPassThru.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiPassThru.c
@@ -57,7 +57,7 @@ NvmeCreatePrpList (
       DEBUG_ERROR,

       "%a: The implementation only supports PrpList number up to 4."

       " But %d are needed here.\n",

-      __FUNCTION__,

+      __func__,

       PrpListNo

       ));

     return 0;

@@ -365,7 +365,7 @@ NvmePassThruExecute (
     DEBUG ((

       DEBUG_ERROR,

       "%a, Invalid parameter: Packet(%lx)\n",

-      __FUNCTION__,

+      __func__,

       (UINTN)Packet

       ));

     return EFI_INVALID_PARAMETER;

@@ -375,7 +375,7 @@ NvmePassThruExecute (
     DEBUG ((

       DEBUG_ERROR,

       "%a, Invalid parameter: NvmeCmd (%lx)/NvmeCompletion(%lx)\n",

-      __FUNCTION__,

+      __func__,

       (UINTN)Packet->NvmeCmd,

       (UINTN)Packet->NvmeCompletion

       ));

@@ -386,7 +386,7 @@ NvmePassThruExecute (
     DEBUG ((

       DEBUG_ERROR,

       "%a, Invalid parameter: QueueId(%lx)\n",

-      __FUNCTION__,

+      __func__,

       (UINTN)Packet->QueueType

       ));

     return EFI_INVALID_PARAMETER;

@@ -407,7 +407,7 @@ NvmePassThruExecute (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Nsid mismatch (%x, %x)\n",

-      __FUNCTION__,

+      __func__,

       Packet->NvmeCmd->Nsid,

       NamespaceId

       ));

@@ -425,7 +425,7 @@ NvmePassThruExecute (
   //

   ASSERT (Sq->Psdt == 0);

   if (Sq->Psdt != 0) {

-    DEBUG ((DEBUG_ERROR, "%a: Does not support SGL mechanism.\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: Does not support SGL mechanism.\n", __func__));

     return EFI_UNSUPPORTED;

   }

 

@@ -458,7 +458,7 @@ NvmePassThruExecute (
         DEBUG ((

           DEBUG_ERROR,

           "%a: Does not support external IO queues creation request.\n",

-          __FUNCTION__

+          __func__

           ));

         return EFI_UNSUPPORTED;

       }

@@ -480,7 +480,7 @@ NvmePassThruExecute (
                       );

         if (EFI_ERROR (Status) || (MapLength != Packet->TransferLength)) {

           Status = EFI_OUT_OF_RESOURCES;

-          DEBUG ((DEBUG_ERROR, "%a: Fail to map data buffer.\n", __FUNCTION__));

+          DEBUG ((DEBUG_ERROR, "%a: Fail to map data buffer.\n", __func__));

           goto Exit;

         }

 

@@ -498,7 +498,7 @@ NvmePassThruExecute (
                       );

         if (EFI_ERROR (Status) || (MapLength != Packet->MetadataLength)) {

           Status = EFI_OUT_OF_RESOURCES;

-          DEBUG ((DEBUG_ERROR, "%a: Fail to map meta data buffer.\n", __FUNCTION__));

+          DEBUG ((DEBUG_ERROR, "%a: Fail to map meta data buffer.\n", __func__));

           goto Exit;

         }

 

@@ -526,7 +526,7 @@ NvmePassThruExecute (
                    );

     if (Sq->Prp[1] == 0) {

       Status = EFI_OUT_OF_RESOURCES;

-      DEBUG ((DEBUG_ERROR, "%a: Create PRP list fail, Status - %r\n", __FUNCTION__, Status));

+      DEBUG ((DEBUG_ERROR, "%a: Create PRP list fail, Status - %r\n", __func__, Status));

       goto Exit;

     }

   } else if ((Offset + Bytes) > EFI_PAGE_SIZE) {

@@ -568,7 +568,7 @@ NvmePassThruExecute (
   Data32 = ReadUnaligned32 ((UINT32 *)&Private->SqTdbl[QueueId]);

   Status = NVME_SET_SQTDBL (Private, QueueId, &Data32);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: NVME_SET_SQTDBL fail, Status - %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: NVME_SET_SQTDBL fail, Status - %r\n", __func__, Status));

     goto Exit;

   }

 

@@ -591,7 +591,7 @@ NvmePassThruExecute (
     //

     // Timeout occurs for an NVMe command, reset the controller to abort the outstanding command

     //

-    DEBUG ((DEBUG_ERROR, "%a: Timeout occurs for the PassThru command.\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: Timeout occurs for the PassThru command.\n", __func__));

     Status = NvmeControllerInit (Private);

     if (EFI_ERROR (Status)) {

       Status = EFI_DEVICE_ERROR;