diff options
Diffstat (limited to 'drivers/acpi/acpica/utids.c')
-rw-r--r-- | drivers/acpi/acpica/utids.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c index 3afe07f19b9f..7956df1e263c 100644 --- a/drivers/acpi/acpica/utids.c +++ b/drivers/acpi/acpica/utids.c | |||
@@ -111,7 +111,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node, | |||
111 | if (obj_desc->common.type == ACPI_TYPE_INTEGER) { | 111 | if (obj_desc->common.type == ACPI_TYPE_INTEGER) { |
112 | acpi_ex_eisa_id_to_string(hid->string, obj_desc->integer.value); | 112 | acpi_ex_eisa_id_to_string(hid->string, obj_desc->integer.value); |
113 | } else { | 113 | } else { |
114 | ACPI_STRCPY(hid->string, obj_desc->string.pointer); | 114 | strcpy(hid->string, obj_desc->string.pointer); |
115 | } | 115 | } |
116 | 116 | ||
117 | hid->length = length; | 117 | hid->length = length; |
@@ -180,7 +180,7 @@ acpi_ut_execute_SUB(struct acpi_namespace_node *device_node, | |||
180 | 180 | ||
181 | /* Simply copy existing string */ | 181 | /* Simply copy existing string */ |
182 | 182 | ||
183 | ACPI_STRCPY(sub->string, obj_desc->string.pointer); | 183 | strcpy(sub->string, obj_desc->string.pointer); |
184 | sub->length = length; | 184 | sub->length = length; |
185 | *return_id = sub; | 185 | *return_id = sub; |
186 | 186 | ||
@@ -256,7 +256,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node, | |||
256 | if (obj_desc->common.type == ACPI_TYPE_INTEGER) { | 256 | if (obj_desc->common.type == ACPI_TYPE_INTEGER) { |
257 | acpi_ex_integer_to_string(uid->string, obj_desc->integer.value); | 257 | acpi_ex_integer_to_string(uid->string, obj_desc->integer.value); |
258 | } else { | 258 | } else { |
259 | ACPI_STRCPY(uid->string, obj_desc->string.pointer); | 259 | strcpy(uid->string, obj_desc->string.pointer); |
260 | } | 260 | } |
261 | 261 | ||
262 | uid->length = length; | 262 | uid->length = length; |
@@ -393,8 +393,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node, | |||
393 | 393 | ||
394 | /* Copy the String CID from the returned object */ | 394 | /* Copy the String CID from the returned object */ |
395 | 395 | ||
396 | ACPI_STRCPY(next_id_string, | 396 | strcpy(next_id_string, cid_objects[i]->string.pointer); |
397 | cid_objects[i]->string.pointer); | ||
398 | length = cid_objects[i]->string.length + 1; | 397 | length = cid_objects[i]->string.length + 1; |
399 | } | 398 | } |
400 | 399 | ||