[edk2] [PATCH] MdeModulePkg: Remove redundant things in inf and .h files

shenglei posted 1 patch 17 weeks ago
Failed in applying to current master (apply log)
MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h   | 1 -
MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf | 1 -
MdeModulePkg/Core/Dxe/DxeMain.h                      | 1 -
MdeModulePkg/Core/Dxe/DxeMain.inf                    | 1 -
MdeModulePkg/Core/PiSmmCore/PiSmmCore.h              | 1 -
MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf            | 2 --
MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf | 1 -
MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h  | 1 -
8 files changed, 9 deletions(-)

[edk2] [PATCH] MdeModulePkg: Remove redundant things in inf and .h files

Posted by shenglei 17 weeks ago
A redundant GUID and some library classes are removed
https://bugzilla.tianocore.org/show_bug.cgi?id=1062

Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h   | 1 -
 MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf | 1 -
 MdeModulePkg/Core/Dxe/DxeMain.h                      | 1 -
 MdeModulePkg/Core/Dxe/DxeMain.inf                    | 1 -
 MdeModulePkg/Core/PiSmmCore/PiSmmCore.h              | 1 -
 MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf            | 2 --
 MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf | 1 -
 MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h  | 1 -
 8 files changed, 9 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
index 5e6f66892f..0bd62c2459 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
@@ -33,7 +33,6 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/IoLib.h>
-#include <Library/PciLib.h>
 #include <Library/TimerLib.h>
 
 //
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
index 8b2523a39c..9591572fec 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
@@ -50,7 +50,6 @@
   MemoryAllocationLib
   BaseMemoryLib
   IoLib
-  PciLib
   TimerLib
   PeimEntryPoint
 
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 8f0b28d095..2dec9da5e3 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -89,7 +89,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/ReportStatusCodeLib.h>
-#include <Library/TimerLib.h>
 #include <Library/DxeServicesLib.h>
 #include <Library/DebugAgentLib.h>
 #include <Library/CpuExceptionHandlerLib.h>
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index fc8af3d293..69065d1305 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -97,7 +97,6 @@
   UefiBootServicesTableLib
   DevicePathLib
   ReportStatusCodeLib
-  TimerLib
   DxeServicesLib
   DebugAgentLib
   CpuExceptionHandlerLib
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
index 2d3447e338..cbc27e717d 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
@@ -58,7 +58,6 @@
 #include <Library/PcdLib.h>
 #include <Library/SmmCorePlatformHookLib.h>
 #include <Library/PerformanceLib.h>
-#include <Library/TimerLib.h>
 #include <Library/HobLib.h>
 #include <Library/SmmMemLib.h>
 
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index f11ccb0e07..f3ece22121 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -63,7 +63,6 @@
   PcdLib
   SmmCorePlatformHookLib
   PerformanceLib
-  TimerLib
   HobLib
   SmmMemLib
 
@@ -89,7 +88,6 @@
   gEfiSmmGpiDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES
   gEfiSmmIoTrapDispatch2ProtocolGuid            ## SOMETIMES_CONSUMES
   gEfiSmmUsbDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES
-  gEfiSmmCpuProtocolGuid                        ## SOMETIMES_CONSUMES
   gEdkiiSmmMemoryAttributeProtocolGuid          ## CONSUMES
   gEfiSmmSxDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES
 
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index dce39681d1..c6e7262cea 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -108,7 +108,6 @@
   gEfiIfrTianoGuid                              ## SOMETIMES_PRODUCES ## UNDEFINED
   gEfiAcpiTableGuid                             ## SOMETIMES_CONSUMES ## SystemTable
   gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable
-  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable
   ## SOMETIMES_PRODUCES ## Variable:L"iSCSIDeviceList"
   ## SOMETIMES_CONSUMES ## Variable:L"iSCSIDeviceList"
   ## SOMETIMES_CONSUMES ## UNDEFINED # HiiIsConfigHdrMatch   mVendorStorageName
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index 082199c1b7..8a5ee2149e 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -26,7 +26,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiRuntimeServicesTableLib.h>
 
 #include <Guid/EventGroup.h>
-#include <Guid/Acpi.h>
 
 #include "IScsiCommon.h"
 #include "IScsiDriver.h"
-- 
2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] MdeModulePkg: Remove redundant things in inf and .h files

Posted by Zeng, Star 17 weeks ago
I suggest merging this patch with https://lists.01.org/pipermail/edk2-devel/2018-August/027953.html to one patch.
And remember to update the new patch's version.

Thanks,
Star
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of shenglei
Sent: Thursday, August 9, 2018 4:40 PM
To: edk2-devel@lists.01.org
Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: [edk2] [PATCH] MdeModulePkg: Remove redundant things in inf and .h files

A redundant GUID and some library classes are removed
https://bugzilla.tianocore.org/show_bug.cgi?id=1062

Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h   | 1 -
 MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf | 1 -
 MdeModulePkg/Core/Dxe/DxeMain.h                      | 1 -
 MdeModulePkg/Core/Dxe/DxeMain.inf                    | 1 -
 MdeModulePkg/Core/PiSmmCore/PiSmmCore.h              | 1 -
 MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf            | 2 --
 MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf | 1 -  MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h  | 1 -
 8 files changed, 9 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
index 5e6f66892f..0bd62c2459 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
@@ -33,7 +33,6 @@
 #include <Library/MemoryAllocationLib.h>  #include <Library/BaseMemoryLib.h>  #include <Library/IoLib.h> -#include <Library/PciLib.h>  #include <Library/TimerLib.h>
 
 //
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
index 8b2523a39c..9591572fec 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
@@ -50,7 +50,6 @@
   MemoryAllocationLib
   BaseMemoryLib
   IoLib
-  PciLib
   TimerLib
   PeimEntryPoint
 
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h index 8f0b28d095..2dec9da5e3 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -89,7 +89,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/ReportStatusCodeLib.h> -#include <Library/TimerLib.h>  #include <Library/DxeServicesLib.h>  #include <Library/DebugAgentLib.h>  #include <Library/CpuExceptionHandlerLib.h>
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index fc8af3d293..69065d1305 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -97,7 +97,6 @@
   UefiBootServicesTableLib
   DevicePathLib
   ReportStatusCodeLib
-  TimerLib
   DxeServicesLib
   DebugAgentLib
   CpuExceptionHandlerLib
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
index 2d3447e338..cbc27e717d 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
@@ -58,7 +58,6 @@
 #include <Library/PcdLib.h>
 #include <Library/SmmCorePlatformHookLib.h>
 #include <Library/PerformanceLib.h>
-#include <Library/TimerLib.h>
 #include <Library/HobLib.h>
 #include <Library/SmmMemLib.h>
 
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index f11ccb0e07..f3ece22121 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -63,7 +63,6 @@
   PcdLib
   SmmCorePlatformHookLib
   PerformanceLib
-  TimerLib
   HobLib
   SmmMemLib
 
@@ -89,7 +88,6 @@
   gEfiSmmGpiDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES
   gEfiSmmIoTrapDispatch2ProtocolGuid            ## SOMETIMES_CONSUMES
   gEfiSmmUsbDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES
-  gEfiSmmCpuProtocolGuid                        ## SOMETIMES_CONSUMES
   gEdkiiSmmMemoryAttributeProtocolGuid          ## CONSUMES
   gEfiSmmSxDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES
 
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index dce39681d1..c6e7262cea 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -108,7 +108,6 @@
   gEfiIfrTianoGuid                              ## SOMETIMES_PRODUCES ## UNDEFINED
   gEfiAcpiTableGuid                             ## SOMETIMES_CONSUMES ## SystemTable
   gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable
-  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable
   ## SOMETIMES_PRODUCES ## Variable:L"iSCSIDeviceList"
   ## SOMETIMES_CONSUMES ## Variable:L"iSCSIDeviceList"
   ## SOMETIMES_CONSUMES ## UNDEFINED # HiiIsConfigHdrMatch   mVendorStorageName
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index 082199c1b7..8a5ee2149e 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -26,7 +26,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiRuntimeServicesTableLib.h>
 
 #include <Guid/EventGroup.h>
-#include <Guid/Acpi.h>
 
 #include "IScsiCommon.h"
 #include "IScsiDriver.h"
--
2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] MdeModulePkg: Remove redundant things in inf and .h files

Posted by Laszlo Ersek 17 weeks ago
On 08/10/18 10:47, Zeng, Star wrote:
> I suggest merging this patch with https://lists.01.org/pipermail/edk2-devel/2018-August/027953.html to one patch.
> And remember to update the new patch's version.

There's another thing to remember please, when posting the new version
of the series:

  for every patch X:
    if patch X has received Reviewed-by tags in the v1 review, and
       patch X is not changed between v1 and v2
    then
      the v2 posting of patch X should carry the Reviewed-by tags from
        the v1 review.

I would very much *not* like to re-review those patches that I have
reviewed already, and are not changed in the v2 iteration.

In practice this means editing the commit message of every *unchanged*
patch, and appending the Reviewed-by tags from the mailing list for that
patch, at the bottom of the commit message. Use git-rebase + "reword".

(Sorry if I shouldn't have spelled this out; I'm unsure how much
experience Shenglei has with git.)

Thanks
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel