src/soc/intel/skylake/acpi: Remove Return for PS0/3

Remove the Return statement within the PS0, PS3 methods. PS0/3 are not
allowed to return anything. Even an empty return will be resolved to
Return(Null). In order to be conform with the specification, the code
has been refactored to remove the return statements.

Change-Id: I7b4820e8dd40a9169a7facce67282b8af5af67af
Signed-off-by: Christian Walter <christian.walter@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33293
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Christian Walter
2019-06-07 10:36:24 +02:00
committed by Felix Held
parent e4c09d9137
commit 343e13489e

View File

@@ -129,12 +129,8 @@ Device (XHCI)
Method (_PS0, 0, Serialized) Method (_PS0, 0, Serialized)
{ {
If (LEqual (^DVID, 0xFFFF)) { If (!LEqual (^DVID, 0xFFFF)) {
Return If (!LOr (LEqual (^XMEM, 0xFFFF), LEqual (^XMEM, 0x0000))) {
}
If (LOr (LEqual (^XMEM, 0xFFFF), LEqual (^XMEM, 0x0000))) {
Return
}
/* Disable d3hot and SS link trunk clock gating */ /* Disable d3hot and SS link trunk clock gating */
Store(Zero, ^D3HE) Store(Zero, ^D3HE)
@@ -168,15 +164,13 @@ Device (XHCI)
} }
} }
} }
}
}
Method (_PS3, 0, Serialized) Method (_PS3, 0, Serialized)
{ {
If (LEqual (^DVID, 0xFFFF)) { If (!LEqual (^DVID, 0xFFFF)) {
Return If (!LOr (LEqual (^XMEM, 0xFFFF), LEqual (^XMEM, 0x0000))) {
}
If (LOr (LEqual (^XMEM, 0xFFFF), LEqual (^XMEM, 0x0000))) {
Return
}
/* Clear PME Status */ /* Clear PME Status */
Store (1, ^PMES) Store (1, ^PMES)
@@ -223,6 +217,8 @@ Device (XHCI)
} }
} }
} }
}
}
/* Root Hub for Skylake-LP PCH */ /* Root Hub for Skylake-LP PCH */
Device (RHUB) Device (RHUB)