diff mbox

[Linaro-uefi,v2,2/2] Platforms/AMD/Styx: use anonymous return values for I2Cn::SSCN/FMCN

Message ID 1474305396-18809-2-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 224cb303d62a789a8f4b43bcc08a1154925734ad
Headers show

Commit Message

Ard Biesheuvel Sept. 19, 2016, 5:16 p.m. UTC
The compiler complains about the named objects used to hold the return
values of the I2C0 and I2C1 SSCN and FMCN methods:

  Method (SSCN, 0, NotSerialized)
  Control Method should be made Serialized ^
  (due to creation of named objects within)

  Method (FMCN, 0, NotSerialized)
  Control Method should be made Serialized ^
  (due to creation of named objects within)

So return anonymous rather than named packages to shut up the compiler
diagnostic.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
v2: new patch

 Platforms/AMD/Styx/AcpiTables/Dsdt.asl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Comments

Graeme Gregory Sept. 19, 2016, 5:36 p.m. UTC | #1
No idea how I missed that at the time.

Acked-by: Graeme Gregory <graeme.gregory@linaro.org>



On 19 September 2016 at 18:16, Ard Biesheuvel <ard.biesheuvel@linaro.org>
wrote:

> The compiler complains about the named objects used to hold the return

> values of the I2C0 and I2C1 SSCN and FMCN methods:

>

>   Method (SSCN, 0, NotSerialized)

>   Control Method should be made Serialized ^

>   (due to creation of named objects within)

>

>   Method (FMCN, 0, NotSerialized)

>   Control Method should be made Serialized ^

>   (due to creation of named objects within)

>

> So return anonymous rather than named packages to shut up the compiler

> diagnostic.

>

> Contributed-under: TianoCore Contribution Agreement 1.0

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---

> v2: new patch

>

>  Platforms/AMD/Styx/AcpiTables/Dsdt.asl | 12 ++++--------

>  1 file changed, 4 insertions(+), 8 deletions(-)

>

> diff --git a/Platforms/AMD/Styx/AcpiTables/Dsdt.asl b/Platforms/AMD/Styx/

> AcpiTables/Dsdt.asl

> index 554cb8738529..4e80e4e59547 100644

> --- a/Platforms/AMD/Styx/AcpiTables/Dsdt.asl

> +++ b/Platforms/AMD/Styx/AcpiTables/Dsdt.asl

> @@ -397,24 +397,22 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "AMDINC",

> "SEATTLE ", 3)

>

>              Method (SSCN, 0, NotSerialized)

>              {

> -                Name (PKG, Package (0x03)

> +                Return (Package (0x03)

>                  {

>                      0x0430,

>                      0x04E1,

>                      0x00

>                  })

> -                Return (PKG)

>              }

>

>              Method (FMCN, 0, NotSerialized)

>              {

> -                Name (PKG, Package (0x03)

> +                Return (Package (0x03)

>                  {

>                      0x00DE,

>                      0x018F,

>                      0x00

>                  })

> -                Return (PKG)

>              }

>          }

>

> @@ -433,24 +431,22 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "AMDINC",

> "SEATTLE ", 3)

>

>              Method (SSCN, 0, NotSerialized)

>              {

> -                Name (PKG, Package (0x03)

> +                Return (Package (0x03)

>                  {

>                      0x0430,

>                      0x04E1,

>                      0x00

>                  })

> -                Return (PKG)

>              }

>

>              Method (FMCN, 0, NotSerialized)

>              {

> -                Name (PKG, Package (0x03)

> +                Return (Package (0x03)

>                  {

>                      0x00DE,

>                      0x018F,

>                      0x00

>                  })

> -                Return (PKG)

>              }

>          }

>

> --

> 2.7.4

>

>
diff mbox

Patch

diff --git a/Platforms/AMD/Styx/AcpiTables/Dsdt.asl b/Platforms/AMD/Styx/AcpiTables/Dsdt.asl
index 554cb8738529..4e80e4e59547 100644
--- a/Platforms/AMD/Styx/AcpiTables/Dsdt.asl
+++ b/Platforms/AMD/Styx/AcpiTables/Dsdt.asl
@@ -397,24 +397,22 @@  DefinitionBlock ("DSDT.aml", "DSDT", 2, "AMDINC", "SEATTLE ", 3)
 
             Method (SSCN, 0, NotSerialized)
             {
-                Name (PKG, Package (0x03)
+                Return (Package (0x03)
                 {
                     0x0430,
                     0x04E1,
                     0x00
                 })
-                Return (PKG)
             }
 
             Method (FMCN, 0, NotSerialized)
             {
-                Name (PKG, Package (0x03)
+                Return (Package (0x03)
                 {
                     0x00DE,
                     0x018F,
                     0x00
                 })
-                Return (PKG)
             }
         }
 
@@ -433,24 +431,22 @@  DefinitionBlock ("DSDT.aml", "DSDT", 2, "AMDINC", "SEATTLE ", 3)
 
             Method (SSCN, 0, NotSerialized)
             {
-                Name (PKG, Package (0x03)
+                Return (Package (0x03)
                 {
                     0x0430,
                     0x04E1,
                     0x00
                 })
-                Return (PKG)
             }
 
             Method (FMCN, 0, NotSerialized)
             {
-                Name (PKG, Package (0x03)
+                Return (Package (0x03)
                 {
                     0x00DE,
                     0x018F,
                     0x00
                 })
-                Return (PKG)
             }
         }