ACPICA: De-macroize calls to standard C library functions

ACPICA commit 3b1026e0bdd3c32eb6d5d313f3ba0b1fee7597b4
ACPICA commit 00f0dc83f5cfca53b27a3213ae0d7719b88c2d6b
ACPICA commit 47d22a738d0e19fd241ffe4e3e9d4e198e4afc69

Across all of ACPICA. Replace C library macros such as ACPI_STRLEN with the
standard names such as strlen. The original purpose for these macros is
long since obsolete.
Also cast various invocations as necessary. Bob Moore, Jung-uk Kim, Lv Zheng.

Link: https://github.com/acpica/acpica/commit/3b1026e0
Link: https://github.com/acpica/acpica/commit/00f0dc83
Link: https://github.com/acpica/acpica/commit/47d22a73
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Jung-uk Kim <jkim@FreeBSD.org>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index c37ec5035f4c..257221d452c8 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -129,7 +129,7 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
 
         /* Always clear the external object */
 
-        ACPI_MEMSET(external_object, 0, sizeof(union acpi_object));
+        memset(external_object, 0, sizeof(union acpi_object));
 
         /*
          * In general, the external object will be the same type as
@@ -149,9 +149,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
                                                                   string.
                                                                   length + 1);
 
-                ACPI_MEMCPY((void *)data_space,
-                            (void *)internal_object->string.pointer,
-                            (acpi_size) internal_object->string.length + 1);
+                memcpy((void *)data_space,
+                       (void *)internal_object->string.pointer,
+                       (acpi_size) internal_object->string.length + 1);
                 break;
 
         case ACPI_TYPE_BUFFER:
@@ -162,9 +162,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
                     ACPI_ROUND_UP_TO_NATIVE_WORD(internal_object->string.
                                                  length);
 
-                ACPI_MEMCPY((void *)data_space,
-                            (void *)internal_object->buffer.pointer,
-                            internal_object->buffer.length);
+                memcpy((void *)data_space,
+                       (void *)internal_object->buffer.pointer,
+                       internal_object->buffer.length);
                 break;
 
         case ACPI_TYPE_INTEGER:
@@ -502,9 +502,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                         goto error_exit;
                 }
 
-                ACPI_MEMCPY(internal_object->string.pointer,
-                            external_object->string.pointer,
-                            external_object->string.length);
+                memcpy(internal_object->string.pointer,
+                       external_object->string.pointer,
+                       external_object->string.length);
 
                 internal_object->string.length = external_object->string.length;
                 break;
@@ -517,9 +517,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                         goto error_exit;
                 }
 
-                ACPI_MEMCPY(internal_object->buffer.pointer,
-                            external_object->buffer.pointer,
-                            external_object->buffer.length);
+                memcpy(internal_object->buffer.pointer,
+                       external_object->buffer.pointer,
+                       external_object->buffer.length);
 
                 internal_object->buffer.length = external_object->buffer.length;
 
@@ -694,8 +694,8 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                 copy_size = sizeof(struct acpi_namespace_node);
         }
 
-        ACPI_MEMCPY(ACPI_CAST_PTR(char, dest_desc),
-                    ACPI_CAST_PTR(char, source_desc), copy_size);
+        memcpy(ACPI_CAST_PTR(char, dest_desc),
+               ACPI_CAST_PTR(char, source_desc), copy_size);
 
         /* Restore the saved fields */
 
@@ -725,9 +725,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
 
                         /* Copy the actual buffer data */
 
-                        ACPI_MEMCPY(dest_desc->buffer.pointer,
-                                    source_desc->buffer.pointer,
-                                    source_desc->buffer.length);
+                        memcpy(dest_desc->buffer.pointer,
+                               source_desc->buffer.pointer,
+                               source_desc->buffer.length);
                 }
                 break;
 
@@ -747,9 +747,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
 
                         /* Copy the actual string data */
 
-                        ACPI_MEMCPY(dest_desc->string.pointer,
-                                    source_desc->string.pointer,
-                                    (acpi_size) source_desc->string.length + 1);
+                        memcpy(dest_desc->string.pointer,
+                               source_desc->string.pointer,
+                               (acpi_size) source_desc->string.length + 1);
                 }
                 break;