aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exconvrt.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2015-07-01 02:45:11 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-01 17:17:55 -0400
commit4fa4616e279df89baeb36287bbee83ab272edaed (patch)
tree4e50fd71d00dbb6ed9583589a2f65b048bf3a195 /drivers/acpi/acpica/exconvrt.c
parent63c43812ee99efe7903955bae8cd928e9582477a (diff)
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>
Diffstat (limited to 'drivers/acpi/acpica/exconvrt.c')
-rw-r--r--drivers/acpi/acpica/exconvrt.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index 89a976b4ccf2..075d654c837f 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -227,9 +227,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
227 /* Copy the integer to the buffer, LSB first */ 227 /* Copy the integer to the buffer, LSB first */
228 228
229 new_buf = return_desc->buffer.pointer; 229 new_buf = return_desc->buffer.pointer;
230 ACPI_MEMCPY(new_buf, 230 memcpy(new_buf,
231 &obj_desc->integer.value, 231 &obj_desc->integer.value, acpi_gbl_integer_byte_width);
232 acpi_gbl_integer_byte_width);
233 break; 232 break;
234 233
235 case ACPI_TYPE_STRING: 234 case ACPI_TYPE_STRING:
@@ -252,8 +251,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
252 /* Copy the string to the buffer */ 251 /* Copy the string to the buffer */
253 252
254 new_buf = return_desc->buffer.pointer; 253 new_buf = return_desc->buffer.pointer;
255 ACPI_STRNCPY((char *)new_buf, (char *)obj_desc->string.pointer, 254 strncpy((char *)new_buf, (char *)obj_desc->string.pointer,
256 obj_desc->string.length); 255 obj_desc->string.length);
257 break; 256 break;
258 257
259 default: 258 default: