ASLTS: replace TS with __METHOD__ to improve style

This removes most of the TS objects which is used to store method names.

Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>

3 files changed, 77 insertions, 83 deletions

diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl
index dbe7f625f..cfb378eee 100644
--- a/tests/aslts/src/runtime/collections/functional/table/load.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/load.asl
@@ -2436,111 +2436,109 @@ Local2 = Buffer (0x0A)
 
     Method (TLD0, 0, Serialized)
     {
-        Name (TS, "TLD0")
         /* Loading SSDT from a SystemMemory OpRegion, */
         /* different targets for DDBHandle */
-        CH03 (TS, Z174, 0x0200, 0x084F, 0x00)
+        CH03 (__METHOD__, Z174, 0x0200, 0x084F, 0x00)
         /* Named Objects */
 
         SRMT ("TLD0.tst0")
-        \DTM0.TST0 (TS)
-        CH03 (TS, Z174, 0x0201, 0x0855, 0x00)
+        \DTM0.TST0 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0201, 0x0855, 0x00)
         /* LocalX Object */
 
         SRMT ("TLD0.tst1")
-        \DTM0.TST1 (TS)
-        CH03 (TS, Z174, 0x0202, 0x085B, 0x00)
+        \DTM0.TST1 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0202, 0x085B, 0x00)
         /* Package element */
 
         SRMT ("TLD0.tst2")
-        \DTM0.TST2 (TS)
-        CH03 (TS, Z174, 0x0203, 0x0861, 0x00)
+        \DTM0.TST2 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0203, 0x0861, 0x00)
         /* By Reference in ArgX */
 
         SRMT ("TLD0.tst3")
-        \DTM0.TST3 (TS)
+        \DTM0.TST3 (__METHOD__)
         /* Loading SSDT from a Field of an OpRegion of any type, */
         /* different targets for DDBHandle */
-        CH03 (TS, Z174, 0x0204, 0x086A, 0x00)
+        CH03 (__METHOD__, Z174, 0x0204, 0x086A, 0x00)
         /* SystemMemory Region */
 
         SRMT ("TLD0.tst4")
-        \DTM0.TST4 (TS)
-        CH03 (TS, Z174, 0x0205, 0x0870, 0x00)
+        \DTM0.TST4 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0205, 0x0870, 0x00)
         /* SystemIO Region */
 
         SRMT ("TLD0.tst5")
-        \DTM0.TST5 (TS)
-        CH03 (TS, Z174, 0x0206, 0x0876, 0x00)
+        \DTM0.TST5 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0206, 0x0876, 0x00)
         /* EmbeddedControl Region */
 
         SRMT ("TLD0.tst6")
-        \DTM0.TST6 (TS)
-        CH03 (TS, Z174, 0x0207, 0x087C, 0x00)
+        \DTM0.TST6 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0207, 0x087C, 0x00)
         /* User defined Region */
 
         SRMT ("TLD0.tst7")
-        \DTM0.TST7 (TS)
-        CH03 (TS, Z174, 0x0208, 0x0882, 0x00)
+        \DTM0.TST7 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0208, 0x0882, 0x00)
         /* Check that "namespace location to load the Definition Block */
         /* is relative to the current namespace" scope, */
         SRMT ("TLD0.tst8")
-        \DTM0.TST8 (TS)
-        CH03 (TS, Z174, 0x0209, 0x0889, 0x00)
+        \DTM0.TST8 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0209, 0x0889, 0x00)
         /* Check global and dynamic declarations of OpRegions */
         /* and the appropriate _REG Methods invocation for the */
         /* loaded SSDT */
         SRMT ("TLD0.tst9")
-        \DTM0.TST9 (TS)
-        CH03 (TS, Z174, 0x020A, 0x0891, 0x00)
+        \DTM0.TST9 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x020A, 0x0891, 0x00)
         /* Object of any type can be used as the DDBHandle argument */
 
         SRMT ("TLD0.tstg")
-        \DTM0.TSTG (TS)
-        CH03 (TS, Z174, 0x020B, 0x0897, 0x00)
+        \DTM0.TSTG (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x020B, 0x0897, 0x00)
         /* Loading a number of different SSDTs */
 
         SRMT ("TLD0.tsta")
         If (Y261)
         {
-            \DTM0.TSTA (TS, 0xF0)
+            \DTM0.TSTA (__METHOD__, 0xF0)
         }
         Else
         {
             BLCK ()
         }
 
-        CH03 (TS, Z174, 0x020C, 0x08A1, 0x00)
+        CH03 (__METHOD__, Z174, 0x020C, 0x08A1, 0x00)
         /* Recursive Load in module level */
 
         SRMT ("TLD0.tstk")
-        \DTM0.TSTK (TS)
-        CH03 (TS, Z174, 0x020D, 0x08A7, 0x00)
+        \DTM0.TSTK (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x020D, 0x08A7, 0x00)
     }
 
     /* Exceptional conditions */
 
     Method (TLD1, 0, Serialized)
     {
-        Name (TS, "TLD1")
         /* Exceptions when the Object argument does not refer to */
         /* an operation region field or an operation region */
         SRMT ("TLD1.tstb")
-        \DTM0.TSTB (TS)
+        \DTM0.TSTB (__METHOD__)
         /* Exceptions when the an OpRegion passed as the Object */
         /* parameter of Load is not of SystemMemory type */
         SRMT ("TLD1.tstc")
-        \DTM0.TSTC (TS)
+        \DTM0.TSTC (__METHOD__)
         /* Exceptions when the table contained in an OpRegion */
         /* (Field) is not an SSDT */
         SRMT ("TLD1.tstd")
-        \DTM0.TSTD (TS)
+        \DTM0.TSTD (__METHOD__)
         /* Exceptions when the length of the supplied SSDT is greater */
         /* than the length of the respective OpRegion or Region Field, */
         SRMT ("TLD1.tste.0")
         If (Y284)
         {
-            \DTM0.TSTE (TS, 0x00)
+            \DTM0.TSTE (__METHOD__, 0x00)
         }
         Else
         {
@@ -2550,17 +2548,17 @@ Local2 = Buffer (0x0A)
         /* Exceptions when the length of the supplied SSDT is */
         /* less than the length of the Table Header */
         SRMT ("TLD1.tste.1")
-        \DTM0.TSTE (TS, 0x01)
+        \DTM0.TSTE (__METHOD__, 0x01)
         /* Exceptions when the checksum of the supplied SSDT is invalid */
 
         SRMT ("TLD1.tstf")
-        \DTM0.TSTF (TS)
+        \DTM0.TSTF (__METHOD__)
         /* AE_OWNER_ID_LIMIT exception when too many Tables loaded */
 
         SRMT ("TLD1.tsth")
         If (Y294)
         {
-            \DTM0.TSTH (TS, 0x00)
+            \DTM0.TSTH (__METHOD__, 0x00)
         }
         Else
         {
@@ -2570,9 +2568,9 @@ Local2 = Buffer (0x0A)
         /* Exception when SSDT specified as the Object parameter */
         /* of the Load operator is already loaded */
         SRMT ("TLD1.tsti")
-        \DTM0.TSTI (TS)
+        \DTM0.TSTI (__METHOD__)
         /* Exception when there already is an previously created Object */
         /* referred by the namepath of the new Object in the Table loaded */
         SRMT ("TLD1.tstj")
-        \DTM0.TSTJ (TS)
+        \DTM0.TSTJ (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
index a9a5ad013..5b17fc83c 100644
--- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
@@ -2402,105 +2402,103 @@
 
     Method (TLT0, 0, Serialized)
     {
-        Name (TS, "TLT0")
-        CH03 (TS, Z176, 0x0200, 0x0890, 0x00)
+        CH03 (__METHOD__, Z176, 0x0200, 0x0890, 0x00)
         /* Simple Loadtable test */
 
         SRMT ("TLT0.tst0")
-        \DTM2.TST0 (TS)
-        CH03 (TS, Z176, 0x0201, 0x0896, 0x00)
+        \DTM2.TST0 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0201, 0x0896, 0x00)
         /* All comparisons of Loadtable parameters are case sensitive, */
         /* if no table matches the specified parameters, then 0 is returned */
         SRMT ("TLT0.tst1")
-        \DTM2.TST1 (TS)
-        CH03 (TS, Z176, 0x0202, 0x089D, 0x00)
+        \DTM2.TST1 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0202, 0x089D, 0x00)
         /* Any of the RootPathString, ParameterPathString, and ParameterData */
         /* parameters in LoadTable expression can be omitted */
         SRMT ("TLT0.tst2")
-        \DTM2.TST2 (TS)
-        CH03 (TS, Z176, 0x0203, 0x08A4, 0x00)
+        \DTM2.TST2 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0203, 0x08A4, 0x00)
         /* Different sources of the String parameters: Named Objects, LocalX, */
         /* ArgX, elements of Packages, results of functions, any TermArg */
         SRMT ("TLT0.tst3")
-        \DTM2.TST3 (TS)
-        CH03 (TS, Z176, 0x0204, 0x08AB, 0x00)
+        \DTM2.TST3 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0204, 0x08AB, 0x00)
         /* Different sources of the optional parameters (RootPathString, */
         /* ParameterPathString, and ParameterData): Named Objects, LocalX, */
         /* ArgX, elements of Packages, results of functions, any TermArg */
         SRMT ("TLT0.tst4")
-        \DTM2.TST4 (TS)
-        CH03 (TS, Z176, 0x0205, 0x08B3, 0x00)
+        \DTM2.TST4 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0205, 0x08B3, 0x00)
         /* Namespace location to load the Definition Block is determined */
         /* by the RootPathString parameter of Loadtable */
         SRMT ("TLT0.tst5.0")
-        \DTM2.TST5 (TS, "\\DTM2.DEVR")
-        CH03 (TS, Z176, 0x0206, 0x08BA, 0x00)
+        \DTM2.TST5 (__METHOD__, "\\DTM2.DEVR")
+        CH03 (__METHOD__, Z176, 0x0206, 0x08BA, 0x00)
         /* The RootPathString value is evaluated using normal scoping rules, */
         /* assuming that the scope of the LoadTable operator is the current */
         /* scope */
         SRMT ("TLT0.tst5.1")
-        \DTM2.TST5 (TS, "^DEVR")
-        CH03 (TS, Z176, 0x0207, 0x08C2, 0x00)
+        \DTM2.TST5 (__METHOD__, "^DEVR")
+        CH03 (__METHOD__, Z176, 0x0207, 0x08C2, 0x00)
         /* "\" is assumed to be Namespace location to load the Definition */
         /* Block if RootPathString parameter is not specified */
         SRMT ("TLT0.tst6")
-        \DTM2.TST6 (TS)
-        CH03 (TS, Z176, 0x0208, 0x08C9, 0x00)
+        \DTM2.TST6 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0208, 0x08C9, 0x00)
         /* If the first character of ParameterPathString is a backslash */
         /* or caret character, then the path of the object set up on success */
         /* is ParameterPathString. It is RootPathString.ParameterPathString */
         /* in any case. */
         SRMT ("TLT0.tst7")
-        \DTM2.TST7 (TS)
-        CH03 (TS, Z176, 0x0209, 0x08D2, 0x00)
+        \DTM2.TST7 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0209, 0x08D2, 0x00)
         /* Implicit operand conversion of the parameters specified to be strings */
 
         SRMT ("TLT0.tste")
-        \DTM2.TSTE (TS)
-        CH03 (TS, Z176, 0x020A, 0x08D8, 0x00)
+        \DTM2.TSTE (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x020A, 0x08D8, 0x00)
         /* LoadTable returns 0 if some SSDT matching the LoadTable */
         /* parameters is originally not listed in XSDT */
         /*SRMT("TLT0.tstf") */
         /*\DTM2.tstf(ts) */
-        CH03 (TS, Z176, 0x020B, 0x08DF, 0x00)
+        CH03 (__METHOD__, Z176, 0x020B, 0x08DF, 0x00)
     }
 
     /* Exceptional conditions */
 
     Method (TLT1, 0, Serialized)
     {
-        Name (TS, "TLT1")
         /* Exceptions when the SignatureString is greater than four characters, */
         /* the OEMIDString is greater than six characters, or the OEMTableID is */
         /* greater than eight characters */
         SRMT ("TLT1.tst8")
-        \DTM2.TST8 (TS)
+        \DTM2.TST8 (__METHOD__)
         /* Exceptions when some DSDT or SSDT matching the LoadTable parameters */
         /* is already loaded (actually on initial loading of tables listed in XSDT) */
         SRMT ("TLT1.tst9")
-        \DTM2.TST9 (TS)
+        \DTM2.TST9 (__METHOD__)
         /* Exceptions when the matched table is already loaded */
 
         SRMT ("TLT1.tsta")
-        \DTM2.TSTA (TS)
+        \DTM2.TSTA (__METHOD__)
         /* Exceptions when there already is an previously loaded Object */
         /* referred by the path in the Namespace */
         SRMT ("TLT1.tstb")
-        \DTM2.TSTB (TS)
+        \DTM2.TSTB (__METHOD__)
         /* Exceptions when the object specified by the ParameterPathString */
         /* does not exist */
         SRMT ("TLT1.tstc")
-        \DTM2.TSTC (TS)
+        \DTM2.TSTC (__METHOD__)
         /* Exceptions when storing of data of the ParameterData data type */
         /* to the specified object is not allowed. */
         SRMT ("TLT1.tstd")
-        \DTM2.TSTD (TS)
+        \DTM2.TSTD (__METHOD__)
         /* AE_OWNER_ID_LIMIT exception when too many Tables loaded */
 
         SRMT ("TLT1.tstg")
         If (Y294)
         {
-            \DTM2.TSTG (TS)
+            \DTM2.TSTG (__METHOD__)
         }
         Else
         {
@@ -2510,9 +2508,9 @@
         /* Exceptions when the parameter of the Loadtable operator */
         /* is of incorrect types */
         SRMT ("TLT1.tsth")
-        \DTM2.TSTH (TS)
+        \DTM2.TSTH (__METHOD__)
         /* Exceptions when the ParameterData parameter of the Loadtable operator */
         /* can not be saved into the Object referred by ParameterPathString */
         SRMT ("TLT1.tsti")
-        \DTM2.TSTI (TS)
+        \DTM2.TSTI (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl
index b9076ba71..314e72739 100644
--- a/tests/aslts/src/runtime/collections/functional/table/unload.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl
@@ -770,42 +770,40 @@
 
     Method (TUL0, 0, Serialized)
     {
-        Name (TS, "TUL0")
-        CH03 (TS, Z175, 0x0200, 0x028B, 0x00)
+        CH03 (__METHOD__, Z175, 0x0200, 0x028B, 0x00)
         /* Different Sources to specify DDBHandle for UnLoad. */
         /* Most of them (Named Object, LocalX, ArgX, Derefof) */
         /* are checked in load.asl */
         /* DDBHandle returned by Method call */
         SRMT ("TUL0.tst0")
-        \DTM1.TST0 (TS)
-        CH03 (TS, Z175, 0x0201, 0x0294, 0x00)
+        \DTM1.TST0 (__METHOD__)
+        CH03 (__METHOD__, Z175, 0x0201, 0x0294, 0x00)
         /* All namespace objects created as a result of the corresponding */
         /* Load operation are absent in the namespace after UnLoad */
         SRMT ("TUL0.tst1")
-        \DTM1.TST1 (TS)
-        CH03 (TS, Z175, 0x0202, 0x029B, 0x00)
+        \DTM1.TST1 (__METHOD__)
+        CH03 (__METHOD__, Z175, 0x0202, 0x029B, 0x00)
         /* Load/UnLoad processing can be done with the same table many times */
 
         SRMT ("TUL0.tst2")
-        \DTM1.TST2 (TS)
-        CH03 (TS, Z175, 0x0203, 0x02A1, 0x00)
+        \DTM1.TST2 (__METHOD__)
+        CH03 (__METHOD__, Z175, 0x0203, 0x02A1, 0x00)
     }
 
     /* Exceptional conditions */
 
     Method (TUL1, 0, Serialized)
     {
-        Name (TS, "TUL1")
         /* Exceptions when the parameter of the UnLoad operator */
         /* is not of DDBHandle type */
         SRMT ("TUL1.tst3")
-        \DTM1.TST3 (TS)
+        \DTM1.TST3 (__METHOD__)
         /* Exceptions when UnLoad is executed with the same DDBHandle repeatedly */
 
         SRMT ("TUL1.tst4")
         If (Y292)
         {
-            \DTM1.TST4 (TS)
+            \DTM1.TST4 (__METHOD__)
         }
         Else
         {
@@ -815,5 +813,5 @@
         /* Exceptions when the operand of UnLoad operator is absent */
 
         SRMT ("TUL1.tst5")
-        \DTM1.TST5 (TS)
+        \DTM1.TST5 (__METHOD__)
     }