From: "Pedro Falcato" <pedro.falcato@gmail.com>
To: devel@edk2.groups.io
Cc: Laszlo Ersek <lersek@redhat.com>,
Pedro Falcato <pedro.falcato@gmail.com>,
Jian J Wang <jian.j.wang@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Hao A Wu <hao.a.wu@intel.com>, Ray Ni <ray.ni@intel.com>,
Mike Maslenkin <mike.maslenkin@gmail.com>
Subject: [PATCH v2 03/12] MdeModulePkg/SataControllerDxe: Remove useless null check
Date: Tue, 9 May 2023 17:32:03 +0100 [thread overview]
Message-ID: <20230509163212.291333-4-pedro.falcato@gmail.com> (raw)
In-Reply-To: <20230509163212.291333-1-pedro.falcato@gmail.com>
ASSERT (Private != NULL) already covers this check.
See commit 81310a6.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Mike Maslenkin <mike.maslenkin@gmail.com>
Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
---
.../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
next prev parent reply other threads:[~2023-05-09 16:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-09 16:32 [PATCH v2 00/12] OvmfPkg: Replace the OVMF-specific SataControllerDxe with the generic one Pedro Falcato
2023-05-09 16:32 ` [PATCH v2 01/12] MdeModulePkg/SataControllerDxe: Clean up error handling in Start() Pedro Falcato
2023-05-10 8:30 ` Laszlo Ersek
2023-05-12 1:35 ` [edk2-devel] " Wu, Hao A
2023-05-09 16:32 ` [PATCH v2 02/12] MdeModulePkg/SataControllerDxe: Log expected errors at DEBUG_INFO level Pedro Falcato
2023-05-10 8:32 ` Laszlo Ersek
2023-05-12 1:35 ` Wu, Hao A
2023-05-09 16:32 ` Pedro Falcato [this message]
2023-05-10 8:33 ` [PATCH v2 03/12] MdeModulePkg/SataControllerDxe: Remove useless null check Laszlo Ersek
2023-05-12 1:35 ` [edk2-devel] " Wu, Hao A
2023-05-09 16:32 ` [PATCH v2 04/12] MdeModulePkg/SataControllerDxe: Fix up ASSERTS (Private != NULL) Pedro Falcato
2023-05-10 8:45 ` Laszlo Ersek
2023-05-12 1:36 ` Wu, Hao A
2023-05-09 16:32 ` [PATCH v2 05/12] OvmfPkg: Replace the OVMF-specific SataControllerDxe Pedro Falcato
2023-05-10 8:48 ` Laszlo Ersek
2023-05-09 16:32 ` [PATCH v2 06/12] OvmfPkg/Microvm: " Pedro Falcato
2023-05-10 8:48 ` Laszlo Ersek
2023-05-09 16:32 ` [PATCH v2 07/12] OvmfPkg/Bhyve: " Pedro Falcato
2023-05-10 8:49 ` Laszlo Ersek
2023-05-11 11:58 ` [edk2-devel] " Corvin Köhne
2023-05-09 16:32 ` [PATCH v2 08/12] OvmfPkg/CloudHv: " Pedro Falcato
2023-05-09 16:32 ` [PATCH v2 09/12] OvmfPkg/IntelTdx: " Pedro Falcato
2023-05-09 16:32 ` [PATCH v2 10/12] OvmfPkg/AmdSev: " Pedro Falcato
2023-05-09 16:32 ` [PATCH v2 11/12] OvmfPkg/Xen: " Pedro Falcato
2023-05-12 14:14 ` Anthony PERARD
2023-05-09 16:32 ` [PATCH v2 12/12] OvmfPkg: Remove SataControllerDxe Pedro Falcato
2023-05-10 8:50 ` Laszlo Ersek
2023-05-10 6:49 ` [PATCH v2 00/12] OvmfPkg: Replace the OVMF-specific SataControllerDxe with the generic one Ard Biesheuvel
2023-05-11 4:53 ` Gerd Hoffmann
2023-06-01 16:12 ` Ard Biesheuvel
2023-06-01 17:12 ` Pedro Falcato
2023-06-01 17:13 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230509163212.291333-4-pedro.falcato@gmail.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox