[edk2-devel] [PATCH v2 03/12] MdeModulePkg/SataControllerDxe: Remove useless null check

2023-05-09 Thread Pedro Falcato 
ASSERT (Private != NULL) already covers this check.
See commit 81310a6.

Cc: Jian J Wang 
Cc: Liming Gao 
Cc: Hao A Wu 
Cc: Ray Ni 
Cc: Laszlo Ersek 
Cc: Mike Maslenkin 
Signed-off-by: Pedro Falcato 
---
 .../Pci/SataControllerDxe/SataController.c| 44 +--
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c 
b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
index 277bc6182db6..f0ffd311d7b9 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
@@ -626,34 +626,32 @@ SataControllerStop (
 return Status;
   }
 
-  if (Private != NULL) {
-if (Private->DisqualifiedModes != NULL) {
-  FreePool (Private->DisqualifiedModes);
-}
-
-if (Private->IdentifyData != NULL) {
-  FreePool (Private->IdentifyData);
-}
+  if (Private->DisqualifiedModes != NULL) {
+FreePool (Private->DisqualifiedModes);
+  }
 
-if (Private->IdentifyValid != NULL) {
-  FreePool (Private->IdentifyValid);
-}
+  if (Private->IdentifyData != NULL) {
+FreePool (Private->IdentifyData);
+  }
 
-if (Private->PciAttributesChanged) {
-  //
-  // Restore original PCI attributes
-  //
-  Private->PciIo->Attributes (
-Private->PciIo,
-EfiPciIoAttributeOperationSet,
-Private->OriginalPciAttributes,
-NULL
-);
-}
+  if (Private->IdentifyValid != NULL) {
+FreePool (Private->IdentifyValid);
+  }
 
-FreePool (Private);
+  if (Private->PciAttributesChanged) {
+//
+// Restore original PCI attributes
+//
+Private->PciIo->Attributes (
+  Private->PciIo,
+  EfiPciIoAttributeOperationSet,
+  Private->OriginalPciAttributes,
+  NULL
+  );
   }
 
+  FreePool (Private);
+
   //
   // Close protocols opened by Sata Controller driver
   //
-- 
2.40.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104408): https://edk2.groups.io/g/devel/message/104408
Mute This Topic: https://groups.io/mt/98787856/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v2 03/12] MdeModulePkg/SataControllerDxe: Remove useless null check

2023-05-10 Thread Laszlo Ersek 
On 5/9/23 18:32, Pedro Falcato wrote:
> ASSERT (Private != NULL) already covers this check.
> See commit 81310a6.
> 
> Cc: Jian J Wang 
> Cc: Liming Gao 
> Cc: Hao A Wu 
> Cc: Ray Ni 
> Cc: Laszlo Ersek 
> Cc: Mike Maslenkin 
> Signed-off-by: Pedro Falcato 
> ---
>  .../Pci/SataControllerDxe/SataController.c| 44 +--
>  1 file changed, 21 insertions(+), 23 deletions(-)

Reviewed-by: Laszlo Ersek 




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104519): https://edk2.groups.io/g/devel/message/104519
Mute This Topic: https://groups.io/mt/98787856/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: 
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v2 03/12] MdeModulePkg/SataControllerDxe: Remove useless null check

2023-05-11 Thread Wu, Hao A 
Reviewed-by: Hao A Wu 

Best Regards,
Hao Wu

> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Pedro
> Falcato
> Sent: Wednesday, May 10, 2023 12:32 AM
> To: devel@edk2.groups.io
> Cc: Laszlo Ersek ; Pedro Falcato
> ; Wang, Jian J ; Gao,
> Liming ; Wu, Hao A ; Ni,
> Ray ; Mike Maslenkin 
> Subject: [edk2-devel] [PATCH v2 03/12] MdeModulePkg/SataControllerDxe:
> Remove useless null check
> 
> ASSERT (Private != NULL) already covers this check.
> See commit 81310a6.
> 
> Cc: Jian J Wang 
> Cc: Liming Gao 
> Cc: Hao A Wu 
> Cc: Ray Ni 
> Cc: Laszlo Ersek 
> Cc: Mike Maslenkin 
> Signed-off-by: Pedro Falcato 
> ---
>  .../Pci/SataControllerDxe/SataController.c| 44 +--
>  1 file changed, 21 insertions(+), 23 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
> b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
> index 277bc6182db6..f0ffd311d7b9 100644
> --- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
> +++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
> @@ -626,34 +626,32 @@ SataControllerStop (
>  return Status;
>}
> 
> -  if (Private != NULL) {
> -if (Private->DisqualifiedModes != NULL) {
> -  FreePool (Private->DisqualifiedModes);
> -}
> -
> -if (Private->IdentifyData != NULL) {
> -  FreePool (Private->IdentifyData);
> -}
> +  if (Private->DisqualifiedModes != NULL) {
> +FreePool (Private->DisqualifiedModes);
> +  }
> 
> -if (Private->IdentifyValid != NULL) {
> -  FreePool (Private->IdentifyValid);
> -}
> +  if (Private->IdentifyData != NULL) {
> +FreePool (Private->IdentifyData);
> +  }
> 
> -if (Private->PciAttributesChanged) {
> -  //
> -  // Restore original PCI attributes
> -  //
> -  Private->PciIo->Attributes (
> -Private->PciIo,
> -EfiPciIoAttributeOperationSet,
> -Private->OriginalPciAttributes,
> -NULL
> -);
> -}
> +  if (Private->IdentifyValid != NULL) {
> +FreePool (Private->IdentifyValid);
> +  }
> 
> -FreePool (Private);
> +  if (Private->PciAttributesChanged) {
> +//
> +// Restore original PCI attributes
> +//
> +Private->PciIo->Attributes (
> +  Private->PciIo,
> +  EfiPciIoAttributeOperationSet,
> +  Private->OriginalPciAttributes,
> +  NULL
> +  );
>}
> 
> +  FreePool (Private);
> +
>//
>// Close protocols opened by Sata Controller driver
>//
> --
> 2.40.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104725): https://edk2.groups.io/g/devel/message/104725
Mute This Topic: https://groups.io/mt/98787856/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-