sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg: Change use of EFI_D_* to DEBUG_*

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael D Kinney
2021-11-16 19:21:29 -08:00
committed by mergify[bot]
parent 917e98f3e5
commit 87000d7708
146 changed files with 1560 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
View File

@@ -312,7 +312,7 @@ CheckRemainingDevicePath (
((!SystemHasControllerNode) && (RemainingHasControllerNode) && (RemainingControllerNumber == 0)) ||
((SystemHasControllerNode) && (RemainingHasControllerNode) && (SystemControllerNumber == RemainingControllerNumber)) ||
((!SystemHasControllerNode) && (!RemainingHasControllerNode))) {
DEBUG ((EFI_D_ERROR, "This I2C device has been already started.\n"));
DEBUG ((DEBUG_ERROR, "This I2C device has been already started.\n"));
Status = EFI_UNSUPPORTED;
break;
}
@@ -572,7 +572,7 @@ I2cBusDriverStart (
EFI_OPEN_PROTOCOL_BY_DRIVER
);
if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {
DEBUG ((EFI_D_ERROR, "I2cBus: open I2C host error, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cBus: open I2C host error, Status = %r\n", Status));
return Status;
}
@@ -586,7 +586,7 @@ I2cBusDriverStart (
EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cBus: open private protocol error, Status = %r.\n", Status));
DEBUG ((DEBUG_ERROR, "I2cBus: open private protocol error, Status = %r.\n", Status));
return Status;
}
}
@@ -603,7 +603,7 @@ I2cBusDriverStart (
EFI_OPEN_PROTOCOL_BY_DRIVER
);
if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {
DEBUG ((EFI_D_ERROR, "I2cBus: open I2C enumerate error, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cBus: open I2C enumerate error, Status = %r\n", Status));
goto Error;
}
@@ -616,7 +616,7 @@ I2cBusDriverStart (
EFI_OPEN_PROTOCOL_BY_DRIVER
);
if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {
DEBUG ((EFI_D_ERROR, "I2cBus: open device path error, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cBus: open device path error, Status = %r\n", Status));
goto Error;
}
@@ -637,7 +637,7 @@ I2cBusDriverStart (
//
I2cBusContext = AllocateZeroPool (sizeof (I2C_BUS_CONTEXT));
if (I2cBusContext == NULL) {
DEBUG ((EFI_D_ERROR, "I2cBus: there is no enough memory to allocate.\n"));
DEBUG ((DEBUG_ERROR, "I2cBus: there is no enough memory to allocate.\n"));
Status = EFI_OUT_OF_RESOURCES;
goto Error;
}
@@ -676,7 +676,7 @@ I2cBusDriverStart (
NULL
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cBus: install private protocol error, Status = %r.\n", Status));
DEBUG ((DEBUG_ERROR, "I2cBus: install private protocol error, Status = %r.\n", Status));
goto Error;
}
}
@@ -690,7 +690,7 @@ I2cBusDriverStart (
Error:
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cBus: Start() function failed, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cBus: Start() function failed, Status = %r\n", Status));
if (ParentDevicePath != NULL) {
gBS->CloseProtocol (
Controller,
@@ -921,7 +921,7 @@ RegisterI2cDevice (
// Determine if the device info is valid
//
if ((Device->DeviceGuid == NULL) || (Device->SlaveAddressCount == 0) || (Device->SlaveAddressArray == NULL)) {
DEBUG ((EFI_D_ERROR, "Invalid EFI_I2C_DEVICE reported by I2c Enumerate protocol.\n"));
DEBUG ((DEBUG_ERROR, "Invalid EFI_I2C_DEVICE reported by I2c Enumerate protocol.\n"));
continue;
}

20
MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
View File

@@ -343,7 +343,7 @@ I2cHostDriverStart (
EFI_OPEN_PROTOCOL_BY_DRIVER
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cHost: Open I2C bus configuration error, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cHost: Open I2C bus configuration error, Status = %r\n", Status));
return Status;
}
@@ -359,7 +359,7 @@ I2cHostDriverStart (
EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cHost: Open I2C master error, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cHost: Open I2C master error, Status = %r\n", Status));
goto Exit;
}
@@ -368,7 +368,7 @@ I2cHostDriverStart (
//
I2cHostContext = AllocateZeroPool (sizeof (I2C_HOST_CONTEXT));
if (I2cHostContext == NULL) {
DEBUG ((EFI_D_ERROR, "I2cHost: there is no enough memory to allocate.\n"));
DEBUG ((DEBUG_ERROR, "I2cHost: there is no enough memory to allocate.\n"));
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
@@ -387,7 +387,7 @@ I2cHostDriverStart (
//
Status = I2cMaster->Reset (I2cMaster);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cHost: I2C controller reset failed!\n"));
DEBUG ((DEBUG_ERROR, "I2cHost: I2C controller reset failed!\n"));
goto Exit;
}
@@ -402,7 +402,7 @@ I2cHostDriverStart (
&I2cHostContext->I2cEvent
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cHost: create complete event error, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cHost: create complete event error, Status = %r\n", Status));
goto Exit;
}
@@ -417,7 +417,7 @@ I2cHostDriverStart (
&I2cHostContext->I2cBusConfigurationEvent
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cHost: create bus available event error, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cHost: create bus available event error, Status = %r\n", Status));
goto Exit;
}
@@ -438,7 +438,7 @@ I2cHostDriverStart (
);
Exit:
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "I2cHost: Start() function failed, Status = %r\n", Status));
DEBUG ((DEBUG_ERROR, "I2cHost: Start() function failed, Status = %r\n", Status));
if (I2cBusConfigurationManagement != NULL) {
gBS->CloseProtocol (
Controller,
@@ -514,7 +514,7 @@ I2cHostDriverStop (
TplPrevious = EfiGetCurrentTpl ();
if (TplPrevious > TPL_I2C_SYNC) {
DEBUG ((EFI_D_ERROR, "I2cHost: TPL %d is too high in Stop.\n", TplPrevious));
DEBUG ((DEBUG_ERROR, "I2cHost: TPL %d is too high in Stop.\n", TplPrevious));
return EFI_DEVICE_ERROR;
}
@@ -982,7 +982,7 @@ I2cHostQueueRequest (
//
TplPrevious = EfiGetCurrentTpl ();
if ((TplPrevious > TPL_I2C_SYNC) || ((Event == NULL) && (TplPrevious > TPL_CALLBACK))) {
DEBUG ((EFI_D_ERROR, "ERROR - TPL %d is too high!\n", TplPrevious));
DEBUG ((DEBUG_ERROR, "ERROR - TPL %d is too high!\n", TplPrevious));
return EFI_INVALID_PARAMETER;
}
@@ -991,7 +991,7 @@ I2cHostQueueRequest (
//
I2cRequest = AllocateZeroPool (sizeof (I2C_REQUEST));
if (I2cRequest == NULL) {
DEBUG ((EFI_D_ERROR, "WARNING - Failed to allocate I2C_REQUEST!\n"));
DEBUG ((DEBUG_ERROR, "WARNING - Failed to allocate I2C_REQUEST!\n"));
return EFI_OUT_OF_RESOURCES;
}