From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.647.1685640486159042445 for ; Thu, 01 Jun 2023 10:28:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=c0AkvIRB; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: pedro.falcato@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3f611ccd06eso11189465e9.0 for ; Thu, 01 Jun 2023 10:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685640484; x=1688232484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l4PrTC4ja0k2VOuXG27Xn+GC+a/N6Y4WHy+U81yqpn0=; b=c0AkvIRBxymNuCxm5jpPJi+qcz0RQX1B2l5n5A1GMuJgMUxvmeDn8nhVls1mOopEwS Vvi6FoKtX6HxUTkOcOiIWDaPNgrhaNzXAY2fz/nx4JQrBPIUn4/xnawQh5tgFX1QkiTX lRkRcghNpfHqO+o0jIjZnfk90zbyg2yr6lCNCubyVL49H2UjGU4og9t0IjLL1Qhczfl9 jf068+2mpvZgaCWy0s8RM8NmByJAad4kgwkXPn3xPc+Pe4GIz/S6kUEHMxgdsa/IqY5B evu8EjRQqmcGzRNnB4t4ds5u2q7uZN0uQ0HUatcPzsPgqelsHYshjMEJtyEa6T3o7Of8 EvgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685640484; x=1688232484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l4PrTC4ja0k2VOuXG27Xn+GC+a/N6Y4WHy+U81yqpn0=; b=CnpoNX5cqZ/Lv+0HIih5JaL55AlAb4ijEi2nNBzWn03iyLdONkVOdm5Tsu9rGNQ9P5 jjl2/5g+4/GS/cZajTsQXL/s5CvO5HiKIlZLqNsPYy6tMzndr3L2E20OFdDpnfdJEJ/w l+W3foUzyI/mal5gtGRKuEiakjwyhfD4v+HIx6IisYdjKSFxVYmvSp2tBh9PoAxp4A/4 zYTeiE8ylOwbXSlT30dad6pa2jJPkKDPTBPS/AMYiPId/5i9LNdBF/OgdUgX1rdu0NmZ 5/EKbuovBXsP3zX3CteFCP8RpBPd1FVYgHSMVqumJf7zkHQK6gpm54jkrK4bRhwAOfqS j6vQ== X-Gm-Message-State: AC+VfDyXSYXKNDugJZPLcupJj8gjpkdchL6VnaqNKih9WmvHpF8qVujr 2aCrpky6p03W6qWMBCdo3iSx9p3dCZPIzQ== X-Google-Smtp-Source: ACHHUZ7+it3JiHu8fkEVbg/WbijNjSoVh9rRR9oOf6ZNPVE4kKzJfBB98+NJvpfFIftzE1SGIhmHTg== X-Received: by 2002:a05:600c:3794:b0:3f6:8ef:a213 with SMTP id o20-20020a05600c379400b003f608efa213mr53348wmr.28.1685640484062; Thu, 01 Jun 2023 10:28:04 -0700 (PDT) Return-Path: Received: from PC-PEDRO-ARCH.lan ([2001:8a0:7280:5801:9441:3dce:686c:bfc7]) by smtp.gmail.com with ESMTPSA id n11-20020a7bcbcb000000b003f60d0eef36sm2970511wmi.48.2023.06.01.10.28.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 10:28:03 -0700 (PDT) From: "Pedro Falcato" To: devel@edk2.groups.io Cc: Pedro Falcato , Jian J Wang , Liming Gao , Hao A Wu , Ray Ni , Laszlo Ersek Subject: [PATCH v3 03/12] MdeModulePkg/SataControllerDxe: Remove useless null check Date: Thu, 1 Jun 2023 18:27:31 +0100 Message-Id: <20230601172740.9165-4-pedro.falcato@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230601172740.9165-1-pedro.falcato@gmail.com> References: <20230601172740.9165-1-pedro.falcato@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Pedro Falcato Reviewed-by: Laszlo Ersek Reviewed-by: Hao A Wu --- .../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