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>

18 files changed, 110 insertions, 110 deletions

diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
index 0f0198d308..92fb30638e 100644
--- a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
@@ -759,7 +759,7 @@ AhciPioTransfer (
       DEBUG_ERROR,

       "%a: Driver only support a maximum of 0x%x PRDT entries, "

       "current number of data byte 0x%x is too large, maximum allowed is 0x%x.\n",

-      __FUNCTION__,

+      __func__,

       AHCI_MAX_PRDT_NUMBER,

       DataCount,

       AHCI_MAX_PRDT_NUMBER * AHCI_MAX_DATA_PER_PRDT

@@ -778,7 +778,7 @@ AhciPioTransfer (
                 &MapData

                 );

   if (EFI_ERROR (Status) || (MapLength != DataCount)) {

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

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

     return EFI_OUT_OF_RESOURCES;

   }

 

@@ -860,7 +860,7 @@ AhciPioTransfer (
       Offset         = FisBaseAddr + AHCI_PIO_FIS_OFFSET;

       Status         = AhciCheckMemSet (Offset, AHCI_FIS_TYPE_MASK, AHCI_FIS_PIO_SETUP);

       if (!EFI_ERROR (Status)) {

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

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

         PioFisReceived = TRUE;

       }

 

@@ -874,7 +874,7 @@ AhciPioTransfer (
       Offset = FisBaseAddr + AHCI_D2H_FIS_OFFSET;

       Status = AhciCheckMemSet (Offset, AHCI_FIS_TYPE_MASK, AHCI_FIS_REGISTER_D2H);

       if (!EFI_ERROR (Status)) {

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

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

         D2hFisReceived = TRUE;

       }

 

@@ -918,7 +918,7 @@ AhciPioTransfer (
                Timeout

                );

     if (EFI_ERROR (Status)) {

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

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

       goto Exit;

     }

 

@@ -1479,7 +1479,7 @@ IdentifyAtaDevice (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Not a hard disk device on Port 0x%x PortMultiplierPort 0x%x\n",

-      __FUNCTION__,

+      __func__,

       DeviceData->Port,

       DeviceData->PortMultiplier

       ));

@@ -1489,7 +1489,7 @@ IdentifyAtaDevice (
   DEBUG ((

     DEBUG_INFO,

     "%a: Identify Device: Port 0x%x PortMultiplierPort 0x%x\n",

-    __FUNCTION__,

+    __func__,

     DeviceData->Port,

     DeviceData->PortMultiplier

     ));

@@ -1518,7 +1518,7 @@ IdentifyAtaDevice (
   }

 

   if (Capacity == 0) {

-    DEBUG ((DEBUG_ERROR, "%a: Invalid Capacity (0) for ATA device.\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: Invalid Capacity (0) for ATA device.\n", __func__));

     return EFI_UNSUPPORTED;

   }

 

@@ -1532,7 +1532,7 @@ IdentifyAtaDevice (
   DEBUG ((

     DEBUG_INFO,

     "%a: PhyLogicSectorSupport = 0x%x\n",

-    __FUNCTION__,

+    __func__,

     PhyLogicSectorSupport

     ));

   if ((PhyLogicSectorSupport & (BIT14 | BIT15)) == BIT14) {

@@ -1550,20 +1550,20 @@ IdentifyAtaDevice (
   //

   MaxSectorCount = mMaxTransferBlockNumber[DeviceData->Lba48Bit];

   if ((Media->BlockSize == 0) || (Media->BlockSize > MAX_UINT32 / MaxSectorCount)) {

-    DEBUG ((DEBUG_ERROR, "%a: Invalid BlockSize (0x%x).\n", __FUNCTION__, Media->BlockSize));

+    DEBUG ((DEBUG_ERROR, "%a: Invalid BlockSize (0x%x).\n", __func__, Media->BlockSize));

     return EFI_UNSUPPORTED;

   }

 

   DEBUG ((

     DEBUG_INFO,

     "%a: BlockSize = 0x%x, LastBlock = 0x%lx\n",

-    __FUNCTION__,

+    __func__,

     Media->BlockSize,

     Media->LastBlock

     ));

 

   if ((IdentifyData->trusted_computing_support & BIT0) != 0) {

-    DEBUG ((DEBUG_INFO, "%a: Found Trust Computing feature support.\n", __FUNCTION__));

+    DEBUG ((DEBUG_INFO, "%a: Found Trust Computing feature support.\n", __func__));

     DeviceData->TrustComputing = TRUE;

   }

 

@@ -1686,7 +1686,7 @@ AhciModeInitialization (
 

   Status = AhciReset (AhciBar, AHCI_PEI_RESET_TIMEOUT);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: AHCI HBA reset failed with %r.\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: AHCI HBA reset failed with %r.\n", __func__, Status));

     return EFI_DEVICE_ERROR;

   }

 

@@ -1708,7 +1708,7 @@ AhciModeInitialization (
     DEBUG ((

       DEBUG_ERROR,

       "%a: Transfer-related data allocation failed with %r.\n",

-      __FUNCTION__,

+      __func__,

       Status

       ));

     return EFI_OUT_OF_RESOURCES;

@@ -1814,7 +1814,7 @@ AhciModeInitialization (
         //

         Offset = AHCI_PORT_START + Port * AHCI_PORT_REG_WIDTH + AHCI_PORT_CMD;

         AhciAndReg (AhciBar, Offset, (UINT32) ~(AHCI_PORT_CMD_SUD));

-        DEBUG ((DEBUG_ERROR, "%a: No device detected at Port %d.\n", __FUNCTION__, Port));

+        DEBUG ((DEBUG_ERROR, "%a: No device detected at Port %d.\n", __func__, Port));

         continue;

       }

 

@@ -1844,7 +1844,7 @@ AhciModeInitialization (
         DEBUG ((

           DEBUG_ERROR,

           "%a: Port %d device presence detected but phy not ready (TFD=0x%x).\n",

-          __FUNCTION__,

+          __func__,

           Port,

           Data

           ));

@@ -1866,7 +1866,7 @@ AhciModeInitialization (
         DEBUG ((

           DEBUG_ERROR,

           "%a: Error occurred when waiting for the first D2H register FIS - %r\n",

-          __FUNCTION__,

+          __func__,

           Status

           ));

         continue;

@@ -1876,11 +1876,11 @@ AhciModeInitialization (
       if ((Data & AHCI_ATAPI_SIG_MASK) == AHCI_ATA_DEVICE_SIG) {

         Status = AhciIdentify (Private, Port, 0, PortIndex - 1, &IdentifyData);

         if (EFI_ERROR (Status)) {

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

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

           continue;

         }

 

-        DEBUG ((DEBUG_INFO, "%a: ATA hard disk found on Port %d.\n", __FUNCTION__, Port));

+        DEBUG ((DEBUG_INFO, "%a: ATA hard disk found on Port %d.\n", __func__, Port));

       } else {

         continue;

       }

diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c
index e33d863d2a..7ea36afa25 100644
--- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c
+++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c
@@ -156,7 +156,7 @@ AtaAhciInitPrivateData (
   //

   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;

   }

 

@@ -168,7 +168,7 @@ AtaAhciInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

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

-      __FUNCTION__

+      __func__

       ));

     return Status;

   }

@@ -196,7 +196,7 @@ AtaAhciInitPrivateData (
     DEBUG ((

       DEBUG_ERROR,

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

-      __FUNCTION__

+      __func__

       ));

     return EFI_OUT_OF_RESOURCES;

   }

@@ -260,7 +260,7 @@ AtaAhciInitPrivateData (
     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 = AhciStorageSecurityGetDeviceNo;

@@ -329,7 +329,7 @@ AtaAhciInitPrivateDataFromHostControllerPpi (
       DEBUG ((

         DEBUG_ERROR,

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

-        __FUNCTION__,

+        __func__,

         Controller

         ));

       return Status;

@@ -340,7 +340,7 @@ AtaAhciInitPrivateDataFromHostControllerPpi (
       DEBUG ((

         DEBUG_ERROR,

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

-        __FUNCTION__,

+        __func__,

         Controller,

         Status

         ));

@@ -348,7 +348,7 @@ AtaAhciInitPrivateDataFromHostControllerPpi (
       DEBUG ((

         DEBUG_INFO,

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

-        __FUNCTION__,

+        __func__,

         Controller

         ));

     }

@@ -471,7 +471,7 @@ AtaAhciInitPrivateDataFromPciDevice (
     DEBUG ((

       DEBUG_INFO,

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

-      __FUNCTION__,

+      __func__,

       Status

       ));

   }

@@ -522,7 +522,7 @@ AtaAhciPeimEntry (
   IN CONST EFI_PEI_SERVICES  **PeiServices

   )

 {

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

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

 

   PeiServicesNotifyPpi (&mAtaAhciHostControllerNotify);

 

diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiBlockIo.c b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiBlockIo.c
index c5d1f3fffb..5eb2a9ce82 100644
--- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiBlockIo.c
+++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiBlockIo.c
@@ -101,7 +101,7 @@ AccessAtaDevice (
     DEBUG ((

       DEBUG_BLKIO,

       "%a: Blocking AccessAtaDevice, TransferBlockNumber = %x; StartLba = %x\n",

-      __FUNCTION__,

+      __func__,

       TransferBlockNumber,

       StartLba

       ));

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index e903593b01..b4f1a50799 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1863,7 +1863,7 @@ EhcDriverBindingStart (
       DEBUG ((

         DEBUG_WARN,

         "%a: failed to enable 64-bit DMA on 64-bit capable controller @ %p (%r)\n",

-        __FUNCTION__,

+        __func__,

         Controller,

         Status

         ));

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 6967aabceb..59bbe9fc23 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -836,7 +836,7 @@ EhciInsertAsyncIntTransfer (
   Data = AllocatePool (DataLen);

 

   if (Data == NULL) {

-    DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer\n", __func__));

     return NULL;

   }

 

@@ -858,7 +858,7 @@ EhciInsertAsyncIntTransfer (
           );

 

   if (Urb == NULL) {

-    DEBUG ((DEBUG_ERROR, "%a: failed to create URB\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: failed to create URB\n", __func__));

     gBS->FreePool (Data);

     return NULL;

   }

diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
index 2fb78d8f96..e31c38deed 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
+++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
@@ -1843,7 +1843,7 @@ InitializePciIoProtocol (
       DEBUG ((

         DEBUG_ERROR,

         "%a: resource count exceeds number of emulated BARs\n",

-        __FUNCTION__

+        __func__

         ));

       ASSERT (FALSE);

       break;

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
index b33c903412..b6ed7f7031 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
@@ -216,7 +216,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,

@@ -302,7 +302,7 @@ NvmeWrite (
     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,

@@ -817,7 +817,7 @@ NvmeAsyncRead (
     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,

@@ -945,7 +945,7 @@ NvmeAsyncWrite (
     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/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;

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
index ba4b099bc5..75c9b344ee 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
@@ -237,7 +237,7 @@ LocatePciExpressCapabilityRegBlock (
       DEBUG ((

         DEBUG_WARN,

         "%a: [%02x|%02x|%02x] failed to access config space at offset 0x%x\n",

-        __FUNCTION__,

+        __func__,

         PciIoDevice->BusNumber,

         PciIoDevice->DeviceNumber,

         PciIoDevice->FunctionNumber,

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
index b20bcd310a..d573e532ba 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
@@ -128,7 +128,7 @@ IntersectIoDescriptor (
       EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,

       "%a: %a: add [%Lx, %Lx): %r\n",

       gEfiCallerBaseName,

-      __FUNCTION__,

+      __func__,

       IntersectionBase,

       IntersectionEnd,

       Status

@@ -141,7 +141,7 @@ IntersectIoDescriptor (
     "%a: %a: desc [%Lx, %Lx) type %u conflicts with "

     "aperture [%Lx, %Lx)\n",

     gEfiCallerBaseName,

-    __FUNCTION__,

+    __func__,

     Descriptor->BaseAddress,

     Descriptor->BaseAddress + Descriptor->Length,

     (UINT32)Descriptor->GcdIoType,

@@ -178,7 +178,7 @@ AddIoSpace (
       DEBUG_ERROR,

       "%a: %a: GetIoSpaceMap(): %r\n",

       gEfiCallerBaseName,

-      __FUNCTION__,

+      __func__,

       Status

       ));

     return Status;

@@ -299,7 +299,7 @@ IntersectMemoryDescriptor (
       EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,

       "%a: %a: add [%Lx, %Lx): %r\n",

       gEfiCallerBaseName,

-      __FUNCTION__,

+      __func__,

       IntersectionBase,

       IntersectionEnd,

       Status

@@ -312,7 +312,7 @@ IntersectMemoryDescriptor (
     "%a: %a: desc [%Lx, %Lx) type %u cap %Lx conflicts "

     "with aperture [%Lx, %Lx) cap %Lx\n",

     gEfiCallerBaseName,

-    __FUNCTION__,

+    __func__,

     Descriptor->BaseAddress,

     Descriptor->BaseAddress + Descriptor->Length,

     (UINT32)Descriptor->GcdMemoryType,

@@ -353,7 +353,7 @@ AddMemoryMappedIoSpace (
       DEBUG_ERROR,

       "%a: %a: GetMemorySpaceMap(): %r\n",

       gEfiCallerBaseName,

-      __FUNCTION__,

+      __func__,

       Status

       ));

     return Status;

@@ -955,7 +955,7 @@ NotifyPhase (
               DEBUG ((

                 DEBUG_ERROR,

                 "[%a:%d] Translation %lx is not aligned to %lx!\n",

-                __FUNCTION__,

+                __func__,

                 DEBUG_LINE_NUMBER,

                 Translation,

                 Alignment

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
index ab2becdd19..8496ce4727 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
@@ -641,7 +641,7 @@ SdMmcPciHcDriverBindingStart (
       DEBUG ((

         DEBUG_INFO,

         "%a: found SD/MMC override protocol\n",

-        __FUNCTION__

+        __func__

         ));

     }

   }

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

             DEBUG_WARN,

             "%a: Failed to override capability - %r\n",

-            __FUNCTION__,

+            __func__,

             Status

             ));

           continue;

@@ -691,7 +691,7 @@ SdMmcPciHcDriverBindingStart (
                               (VOID *)&Private->Slot[Slot].OperatingParameters

                               );

         if (EFI_ERROR (Status)) {

-          DEBUG ((DEBUG_WARN, "%a: Failed to get operating parameters, using defaults\n", __FUNCTION__));

+          DEBUG ((DEBUG_WARN, "%a: Failed to get operating parameters, using defaults\n", __func__));

         }

       }

     }

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
index dd45167a00..aab6815328 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
@@ -498,7 +498,7 @@ SdMmcHcReset (
       DEBUG ((

         DEBUG_WARN,

         "%a: SD/MMC pre reset notifier callback failed - %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

       return Status;

@@ -556,7 +556,7 @@ SdMmcHcReset (
       DEBUG ((

         DEBUG_WARN,

         "%a: SD/MMC post reset notifier callback failed - %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

     }

@@ -942,7 +942,7 @@ SdMmcHcClockSupply (
       DEBUG ((

         DEBUG_ERROR,

         "%a: SD/MMC switch clock freq post notifier callback failed - %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

       return Status;

@@ -1234,7 +1234,7 @@ SdMmcHcInitHost (
       DEBUG ((

         DEBUG_WARN,

         "%a: SD/MMC pre init notifier callback failed - %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

       return Status;

@@ -1286,7 +1286,7 @@ SdMmcHcInitHost (
       DEBUG ((

         DEBUG_WARN,

         "%a: SD/MMC post init notifier callback failed - %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

     }

@@ -1375,7 +1375,7 @@ SdMmcHcUhsSignaling (
       DEBUG ((

         DEBUG_ERROR,

         "%a: SD/MMC uhs signaling notifier callback failed - %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

       return Status;

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index d8fa41f68f..62682dd27c 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -2059,7 +2059,7 @@ XhcDriverBindingStart (
       DEBUG ((

         DEBUG_WARN,

         "%a: failed to enable 64-bit DMA on 64-bit capable controller @ %p (%r)\n",

-        __FUNCTION__,

+        __func__,

         Controller,

         Status

         ));

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 4b7462704a..298fb88b81 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -1495,7 +1495,7 @@ XhciInsertAsyncIntTransfer (
 

   Data = AllocateZeroPool (DataLen);

   if (Data == NULL) {

-    DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer\n", __func__));

     return NULL;

   }

 

@@ -1513,7 +1513,7 @@ XhciInsertAsyncIntTransfer (
           Context

           );

   if (Urb == NULL) {

-    DEBUG ((DEBUG_ERROR, "%a: failed to create URB\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: failed to create URB\n", __func__));

     FreePool (Data);

     return NULL;

   }

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 873581d817..670f70caf4 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -2593,7 +2593,7 @@ ScsiDiskInquiryDevice (
           DEBUG ((

             DEBUG_WARN,

             "%a: invalid PageLength (%u) in Supported VPD Pages page\n",

-            __FUNCTION__,

+            __func__,

             (UINT32)PageLength

             ));

           PageLength = 0;

@@ -2606,7 +2606,7 @@ ScsiDiskInquiryDevice (
           DEBUG ((

             DEBUG_WARN,

             "%a: Supported VPD Pages page doesn't start with code 0x%02x\n",

-            __FUNCTION__,

+            __func__,

             EFI_SCSI_PAGE_CODE_SUPPORTED_VPD

             ));

           PageLength = 0;

@@ -2626,7 +2626,7 @@ ScsiDiskInquiryDevice (
             DEBUG ((

               DEBUG_WARN,

               "%a: non-ascending code in Supported VPD Pages page @ %u\n",

-              __FUNCTION__,

+              __func__,

               Index

               ));

             Index      = 0;