diff options
author | Rebecca Cran <rebecca@bsdio.com> | 2023-04-06 13:47:56 -0600 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-04-10 14:19:57 +0000 |
commit | 1639b6bf074c2ee694473d849e1dfa2028f78eab (patch) | |
tree | c69f94a3820f11f664b290b9e9ccaae0c2f22de6 /ArmVirtPkg/Library | |
parent | f2cc962cd28fe75fb4edf230d69e99c346fe9c8a (diff) | |
download | edk2-1639b6bf074c2ee694473d849e1dfa2028f78eab.zip edk2-1639b6bf074c2ee694473d849e1dfa2028f78eab.tar.gz edk2-1639b6bf074c2ee694473d849e1dfa2028f78eab.tar.bz2 |
ArmVirtPkg: 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
ArmVirtPkg.
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>
Diffstat (limited to 'ArmVirtPkg/Library')
14 files changed, 38 insertions, 38 deletions
diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c index 57bbfd2..cf9434e 100644 --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c @@ -150,7 +150,7 @@ ArmVirtGicArchLibConstructor ( break;
default:
- DEBUG ((DEBUG_ERROR, "%a: No GIC revision specified!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: No GIC revision specified!\n", __func__));
return RETURN_NOT_FOUND;
}
diff --git a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c index 45dd9f1..01bcd58 100644 --- a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c +++ b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c @@ -42,7 +42,7 @@ ArmVirtPL031FdtClientLibConstructor ( DEBUG ((
DEBUG_WARN,
"%a: No 'arm,pl031' compatible DT node found\n",
- __FUNCTION__
+ __func__
));
return EFI_SUCCESS;
}
@@ -58,7 +58,7 @@ ArmVirtPL031FdtClientLibConstructor ( DEBUG ((
DEBUG_WARN,
"%a: No 'reg' property found in 'arm,pl031' compatible DT node\n",
- __FUNCTION__
+ __func__
));
return EFI_SUCCESS;
}
diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c index c7065b7..1f27b76 100644 --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c @@ -65,7 +65,7 @@ ArmPsciResetSystemLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown PSCI method \"%a\"\n",
- __FUNCTION__,
+ __func__,
Prop
));
return EFI_NOT_FOUND;
@@ -105,7 +105,7 @@ ResetCold ( break;
default:
- DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__));
}
}
@@ -154,7 +154,7 @@ ResetShutdown ( break;
default:
- DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__));
}
}
diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c index 03d14fe..dffc1fb 100644 --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c @@ -73,7 +73,7 @@ DiscoverPsciMethod ( DEBUG ((
DEBUG_ERROR,
"%a: Missing PSCI method property\n",
- __FUNCTION__
+ __func__
));
return PsciMethodUnknown;
}
@@ -86,7 +86,7 @@ DiscoverPsciMethod ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown PSCI method \"%a\"\n",
- __FUNCTION__,
+ __func__,
Prop
));
return PsciMethodUnknown;
@@ -119,7 +119,7 @@ PerformPsciAction ( break;
default:
- DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__));
ASSERT (FALSE);
}
}
diff --git a/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c b/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c index 28a0c0b..98cc138 100644 --- a/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c @@ -98,7 +98,7 @@ CloudHvVirtMemInfoPeiLibConstructor ( DEBUG ((
DEBUG_INFO,
"%a: System RAM @ 0x%lx - 0x%lx\n",
- __FUNCTION__,
+ __func__,
CurBase,
CurBase + CurSize - 1
));
@@ -124,7 +124,7 @@ CloudHvVirtMemInfoPeiLibConstructor ( DEBUG ((
DEBUG_WARN,
"%a: memory node larger than %d will not be included into Memory System\n",
- __FUNCTION__,
+ __func__,
CLOUDHV_MAX_MEM_NODE_NUM
));
break;
@@ -133,7 +133,7 @@ CloudHvVirtMemInfoPeiLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: Failed to parse FDT memory node\n",
- __FUNCTION__
+ __func__
));
}
}
@@ -186,7 +186,7 @@ ArmVirtGetMemoryMap ( );
if (VirtualMemoryTable == NULL) {
- DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __func__));
return;
}
@@ -205,7 +205,7 @@ ArmVirtGetMemoryMap ( "\tPhysicalBase: 0x%lX\n"
"\tVirtualBase: 0x%lX\n"
"\tLength: 0x%lX\n",
- __FUNCTION__,
+ __func__,
MemNodeIndex,
VirtualMemoryTable[Index].PhysicalBase,
VirtualMemoryTable[Index].VirtualBase,
diff --git a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c index 89eee75..e8d3576 100644 --- a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c +++ b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c @@ -147,7 +147,7 @@ KvmtoolRtcFdtClientLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: No 'motorola,mc146818' compatible DT node found\n",
- __FUNCTION__
+ __func__
));
return Status;
}
@@ -163,7 +163,7 @@ KvmtoolRtcFdtClientLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: No 'reg' property found in 'motorola,mc146818' compatible DT node\n",
- __FUNCTION__
+ __func__
));
return Status;
}
diff --git a/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c b/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c index 2912285..7941289 100644 --- a/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c @@ -54,7 +54,7 @@ ArmVirtGetMemoryMap ( DEBUG ((
DEBUG_ERROR,
"%a: Error: Failed to Allocate Pages\n",
- __FUNCTION__
+ __func__
));
return;
}
diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c index 129c16b..43f5858 100644 --- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c +++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c @@ -265,7 +265,7 @@ NorFlashPlatformLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: GetNodeProperty ('label') failed (Status == %r)\n",
- __FUNCTION__,
+ __func__,
Status
));
} else if (AsciiStrCmp (Label, LABEL_UEFI_VAR_STORE) == 0) {
@@ -284,7 +284,7 @@ NorFlashPlatformLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: GetNodeProperty () failed (Status == %r)\n",
- __FUNCTION__,
+ __func__,
Status
));
continue;
diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c index 55bce88..d0fa7e5 100644 --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c @@ -75,7 +75,7 @@ VirtNorFlashPlatformGetDevices ( DEBUG ((
DEBUG_ERROR,
"%a: GetNodeProperty () failed (Status == %r)\n",
- __FUNCTION__,
+ __func__,
Status
));
continue;
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 3ad1ecd..10c8153 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -190,7 +190,7 @@ FilterAndProcess ( DEBUG ((
DEBUG_VERBOSE,
"%a: %g: %r\n",
- __FUNCTION__,
+ __func__,
ProtocolGuid,
Status
));
@@ -261,7 +261,7 @@ IsPciDisplay ( &Pci
);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
+ DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __func__, ReportText, Status));
return FALSE;
}
@@ -410,7 +410,7 @@ IsVirtioPciRng ( return FALSE;
PciError:
- DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
+ DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __func__, ReportText, Status));
return FALSE;
}
@@ -437,7 +437,7 @@ Connect ( DEBUG ((
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
"%a: %s: %r\n",
- __FUNCTION__,
+ __func__,
ReportText,
Status
));
@@ -463,7 +463,7 @@ AddOutput ( DEBUG ((
DEBUG_ERROR,
"%a: %s: handle %p: device path not found\n",
- __FUNCTION__,
+ __func__,
ReportText,
Handle
));
@@ -475,7 +475,7 @@ AddOutput ( DEBUG ((
DEBUG_ERROR,
"%a: %s: adding to ConOut: %r\n",
- __FUNCTION__,
+ __func__,
ReportText,
Status
));
@@ -487,7 +487,7 @@ AddOutput ( DEBUG ((
DEBUG_ERROR,
"%a: %s: adding to ErrOut: %r\n",
- __FUNCTION__,
+ __func__,
ReportText,
Status
));
@@ -497,7 +497,7 @@ AddOutput ( DEBUG ((
DEBUG_VERBOSE,
"%a: %s: added to ConOut and ErrOut\n",
- __FUNCTION__,
+ __func__,
ReportText
));
}
@@ -698,7 +698,7 @@ RemoveStaleFvFileOptions ( DEBUG ((
EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,
"%a: removing stale Boot#%04x %s: %r\n",
- __FUNCTION__,
+ __func__,
(UINT32)BootOptions[Index].OptionNumber,
DevicePathString == NULL ? L"<unavailable>" : DevicePathString,
Status
@@ -878,7 +878,7 @@ PlatformBootManagerBeforeConsole ( DEBUG ((
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
"%a: SetVariable(%s, %u): %r\n",
- __FUNCTION__,
+ __func__,
EFI_TIME_OUT_VARIABLE_NAME,
FrontPageTimeout,
Status
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c index c66b7c7..7dc59ae 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c @@ -66,7 +66,7 @@ TryRunningQemuKernel ( DEBUG ((
DEBUG_ERROR,
"%a: QemuStartKernelImage(): %r\n",
- __FUNCTION__,
+ __func__,
Status
));
}
diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c index bb71fee..8d9dcf5 100644 --- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c @@ -111,7 +111,7 @@ PlatformPeim ( UartBase = fdt64_to_cpu (ReadUnaligned64 (RegProp));
- DEBUG ((DEBUG_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase));
+ DEBUG ((DEBUG_INFO, "%a: PL011 UART @ 0x%lx\n", __func__, UartBase));
*UartHobData = UartBase;
break;
@@ -148,7 +148,7 @@ PlatformPeim ( DEBUG ((
DEBUG_WARN,
"%a: 'ranges' property has unexpected size %d\n",
- __FUNCTION__,
+ __func__,
RangesLen
));
break;
@@ -175,7 +175,7 @@ PlatformPeim ( if (FeaturePcdGet (PcdTpm2SupportEnabled)) {
if (TpmBase != 0) {
- DEBUG ((DEBUG_INFO, "%a: TPM @ 0x%lx\n", __FUNCTION__, TpmBase));
+ DEBUG ((DEBUG_INFO, "%a: TPM @ 0x%lx\n", __func__, TpmBase));
Status = (EFI_STATUS)PcdSet64S (PcdTpmBaseAddress, TpmBase);
ASSERT_EFI_ERROR (Status);
diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c index 9cf43f0..23bd0fe 100644 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c @@ -83,7 +83,7 @@ ArmVirtGetMemoryMap ( );
if (VirtualMemoryTable == NULL) {
- DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __func__));
return;
}
@@ -99,7 +99,7 @@ ArmVirtGetMemoryMap ( "\tPhysicalBase: 0x%lX\n"
"\tVirtualBase: 0x%lX\n"
"\tLength: 0x%lX\n",
- __FUNCTION__,
+ __func__,
VirtualMemoryTable[0].PhysicalBase,
VirtualMemoryTable[0].VirtualBase,
VirtualMemoryTable[0].Length
diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c index c47ab82..1bcc2e2 100644 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c @@ -64,7 +64,7 @@ QemuVirtMemInfoPeiLibConstructor ( DEBUG ((
DEBUG_INFO,
"%a: System RAM @ 0x%lx - 0x%lx\n",
- __FUNCTION__,
+ __func__,
CurBase,
CurBase + CurSize - 1
));
@@ -77,7 +77,7 @@ QemuVirtMemInfoPeiLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: Failed to parse FDT memory node\n",
- __FUNCTION__
+ __func__
));
}
}
|