diff --git a/Platform/Ampere/AmperePlatformPkg/Drivers/PlatformBootManagerDxe/PlatformBootManagerDxe.c b/Platform/Ampere/AmperePlatformPkg/Drivers/PlatformBootManagerDxe/PlatformBootManagerDxe.c
index 0ea2fce2a18..a5788987291 100644
--- a/Platform/Ampere/AmperePlatformPkg/Drivers/PlatformBootManagerDxe/PlatformBootManagerDxe.c
+++ b/Platform/Ampere/AmperePlatformPkg/Drivers/PlatformBootManagerDxe/PlatformBootManagerDxe.c
@@ -339,12 +339,18 @@ GetUsbDescription (
                   &gEfiDevicePathProtocolGuid,
                   (VOID **)&UsbDevicePath
                   );
+  if (EFI_ERROR (Status)) {
+    return NULL;
+  }
 
   Status = gBS->LocateDevicePath (
                   &gEfiUsbIoProtocolGuid,
                   &UsbDevicePath,
                   &UsbHandle
                   );
+  if (EFI_ERROR (Status)) {
+    return NULL;
+  }
 
   Status = gBS->HandleProtocol (
                   UsbHandle,
@@ -598,6 +604,9 @@ CreateNewBootOption (
                            Handle,
                            OsDescription.OSLoaderPath
                            );
+  if (BootOptionDevicePath == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
   //
   // Skip if Boot Option already exists
   //
@@ -758,11 +767,9 @@ CacheLegacyBootOptions (
   UINTN                         NVBootOptionCount;
   UINTN                         CacheBootOptionCount;
   EFI_BOOT_MANAGER_LOAD_OPTION  *NVBootOptions;
-  BOOLEAN                       AlreadyExistsInBootOptionsList;
 
   NVBootOptionCount = 0;
   NVBootOptions     = NULL;
-  AlreadyExistsInBootOptionsList = FALSE;
   CacheBootOptionCount = *BootOptionListCount;
 
   //
diff --git a/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/DriverBinding.c b/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/DriverBinding.c
index 1d8697b4dce..1818646291c 100644
--- a/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/DriverBinding.c
+++ b/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/DriverBinding.c
@@ -681,6 +681,10 @@ UsbCdcEthernetDriverStop (
                     This->DriverBindingHandle,
                     ControllerHandle
                     );
+    if (EFI_ERROR (Status)) {
+      DEBUG ((DEBUG_ERROR, "%d: Failed to close the bus driver - %r",__LINE__, Status));
+      return Status;
+    }
 
     Status = gBS->CloseProtocol (
                     ControllerHandle,
@@ -688,6 +692,10 @@ UsbCdcEthernetDriverStop (
                     This->DriverBindingHandle,
                     ControllerHandle
                     );
+    if (EFI_ERROR (Status)) {
+      DEBUG ((DEBUG_ERROR, "%d: Failed to close the bus driver - %r",__LINE__, Status));
+      return Status;
+    }
 
     return EFI_SUCCESS;
   }
diff --git a/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/SimpleNetwork.c b/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/SimpleNetwork.c
index 13896271ce5..99bbd4eb6d0 100644
--- a/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/SimpleNetwork.c
+++ b/Platform/Ampere/AmperePlatformPkg/Drivers/UsbCdcEthernetDxe/SimpleNetwork.c
@@ -426,13 +426,13 @@ SnpReceiveFilters (
   UINT8                   Temp;
   UINT16                  CdcFilterMask;
 
-  Mode = This->Mode;
-  CdcFilterMask = USB_CDC_ECM_PACKET_TYPE_DIRECTED | USB_CDC_ECM_PACKET_TYPE_BROADCAST;
-
   if (This == NULL) {
     return EFI_INVALID_PARAMETER;
   }
 
+  Mode = This->Mode;
+  CdcFilterMask = USB_CDC_ECM_PACKET_TYPE_DIRECTED | USB_CDC_ECM_PACKET_TYPE_BROADCAST;
+
   //
   // Check that driver was started and initialised
   //
diff --git a/Platform/Ampere/JadePkg/Drivers/SmbiosCpuDxe/SmbiosCpuDxe.c b/Platform/Ampere/JadePkg/Drivers/SmbiosCpuDxe/SmbiosCpuDxe.c
index 4b602015356..5a04a1bbcf2 100644
--- a/Platform/Ampere/JadePkg/Drivers/SmbiosCpuDxe/SmbiosCpuDxe.c
+++ b/Platform/Ampere/JadePkg/Drivers/SmbiosCpuDxe/SmbiosCpuDxe.c
@@ -308,8 +308,8 @@ GetCacheConfig (
   BOOLEAN SupportWT;
 
   Val = ReadCCSIDR (Level);
-  SupportWT = (Val & (1 << 31)) ? TRUE : FALSE;
-  SupportWB = (Val & (1 << 30)) ? TRUE : FALSE;
+  SupportWT = (Val & (1U << 31)) ? TRUE : FALSE;
+  SupportWB = (Val & (1U << 30)) ? TRUE : FALSE;
   if (SupportWT && SupportWB) {
     return 2; /* Varies with Memory Address */
   }
diff --git a/Platform/Ampere/JadePkg/Library/IOExpanderLib/IOExpanderLib.c b/Platform/Ampere/JadePkg/Library/IOExpanderLib/IOExpanderLib.c
index 7de96aa1438..c166a342c7d 100644
--- a/Platform/Ampere/JadePkg/Library/IOExpanderLib/IOExpanderLib.c
+++ b/Platform/Ampere/JadePkg/Library/IOExpanderLib/IOExpanderLib.c
@@ -77,8 +77,6 @@ IOExpanderI2cRead (
   EFI_STATUS Status;
   UINT32     NumberOfRegisterAddress;
 
-  Status = EFI_SUCCESS;
-
   Status = I2cProbe (I2cBus, IO_EXPANDER_I2C_BUS_SPEED);
   if (EFI_ERROR (Status)) {
     return Status;
@@ -90,17 +88,17 @@ IOExpanderI2cRead (
     return Status;
   }
 
-  return Status;
+  return EFI_SUCCESS;
 }
 
 STATIC
 EFI_STATUS
 IOExpanderI2cWrite (
-  IN UINT32 I2cBus,
-  IN UINT32 I2cAddress,
-  IN UINT8  *RegisterAddress,
-  IN UINT32 *NumberOfRegister,
-  IN UINT8  *Data
+  IN UINT32       I2cBus,
+  IN UINT32       I2cAddress,
+  IN CONST UINT8  *RegisterAddress,
+  IN CONST UINT32 *NumberOfRegister,
+  IN UINT8        *Data
   )
 {
   EFI_STATUS Status;
@@ -120,7 +118,7 @@ IOExpanderI2cWrite (
     return Status;
   }
 
-  return Status;
+  return EFI_SUCCESS;
 }
 
 /**
diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/PcieDeviceConfigDxe/PcieDeviceConfigDxe.c b/Silicon/Ampere/AmpereAltraPkg/Drivers/PcieDeviceConfigDxe/PcieDeviceConfigDxe.c
index 1b3a8a3b8a1..cb368872def 100644
--- a/Silicon/Ampere/AmpereAltraPkg/Drivers/PcieDeviceConfigDxe/PcieDeviceConfigDxe.c
+++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/PcieDeviceConfigDxe/PcieDeviceConfigDxe.c
@@ -922,7 +922,7 @@ DriverCallback (
   switch (Action) {
   case EFI_BROWSER_ACTION_CHANGING:
     if ((QuestionId >= DEVICE_KEY)
-        & (QuestionId <= (DEVICE_KEY + MAX_DEVICE)))
+        & (QuestionId < (DEVICE_KEY + MAX_DEVICE)))
     {
       Status = UpdateDeviceForm (QuestionId - DEVICE_KEY, PrivateData);
       if (EFI_ERROR (Status)) {
diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Dxe/Tcg2Dxe.c b/Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Dxe/Tcg2Dxe.c
index 76574df2271..3ea9b012273 100644
--- a/Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Dxe/Tcg2Dxe.c
+++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Dxe/Tcg2Dxe.c
@@ -1116,7 +1116,7 @@ TcgDxeHashLogExtendEvent (
 {
   EFI_STATUS         Status;
   TPML_DIGEST_VALUES DigestList;
-  TCG_PCR_EVENT2_HDR NoActionEvent;
+  TCG_PCR_EVENT2_HDR NoActionEvent = {0};
 
   if (!mTcgDxeData.BsCap.TPMPresentFlag) {
     return EFI_DEVICE_ERROR;
diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/ArmSpciLib/ArmSpciSvcLib.h b/Silicon/Ampere/AmpereAltraPkg/Library/ArmSpciLib/ArmSpciSvcLib.h
index a80f0174917..a4205707ca1 100644
--- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmSpciLib/ArmSpciSvcLib.h
+++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmSpciLib/ArmSpciSvcLib.h
@@ -92,7 +92,7 @@
 #define OEN_SPCI_END                    0x3F
 
 #define SPCI_SMC(spci_fid)      ((OEN_SPCI_START << FUNCID_OEN_SHIFT) | \
-                                 (1 << 31) | (spci_fid))
+                                 (1U << 31) | (spci_fid))
 #define SPCI_MISC_32(misc_fid)  ((SMC_32 << FUNCID_CC_SHIFT) |  \
                                  SPCI_FID_MISC_FLAG |           \
                                  SPCI_SMC ((misc_fid) << SPCI_FID_MISC_SHIFT))