diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
index bfba7aafe8..7c831e92d0 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
@@ -605,10 +605,6 @@ UfsPassThruGetNextTarget (
   IN OUT UINT8                           **Target
   )
 {
-  UFS_PASS_THRU_PRIVATE_DATA      *Private;
-
-  Private = UFS_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);
-
   if (Target == NULL || *Target == NULL) {
     return EFI_INVALID_PARAMETER;
   }
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
index a9fde3066f..26986cbf26 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
@@ -1431,7 +1431,6 @@ UfsExecScsiCmds (
   UINTN                                MapLength;
   EDKII_UFS_HOST_CONTROLLER_PROTOCOL   *UfsHc;
   EDKII_UFS_HOST_CONTROLLER_OPERATION  Flag;
-  UFS_DATA_DIRECTION                   DataDirection;
   UTP_TR_PRD                           *PrdtBase;
   EFI_TPL                              OldTpl;
   UFS_PASS_THRU_TRANS_REQ              *TransReq;
@@ -1475,18 +1474,14 @@ UfsExecScsiCmds (
   if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {
     DataBuf       = Packet->InDataBuffer;
     DataLen       = Packet->InTransferLength;
-    DataDirection = UfsDataIn;
     Flag          = EdkiiUfsHcOperationBusMasterWrite;
   } else {
     DataBuf       = Packet->OutDataBuffer;
     DataLen       = Packet->OutTransferLength;
-    DataDirection = UfsDataOut;
     Flag          = EdkiiUfsHcOperationBusMasterRead;
   }
 
-  if (DataLen == 0) {
-    DataDirection = UfsNoData;
-  } else {
+  if (DataLen != 0) {
     MapLength = DataLen;
     Status    = UfsHc->Map (
                          UfsHc,