diff options
Diffstat (limited to 'drivers/acpi/sysfs.c')
-rw-r--r-- | drivers/acpi/sysfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index fa76f5e41b5c..262d6ee4735d 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c | |||
@@ -368,10 +368,10 @@ static int acpi_table_attr_init(struct kobject *tables_obj, | |||
368 | char instance_str[ACPI_INST_SIZE]; | 368 | char instance_str[ACPI_INST_SIZE]; |
369 | 369 | ||
370 | sysfs_attr_init(&table_attr->attr.attr); | 370 | sysfs_attr_init(&table_attr->attr.attr); |
371 | ACPI_MOVE_NAME(table_attr->name, table_header->signature); | 371 | ACPI_COPY_NAMESEG(table_attr->name, table_header->signature); |
372 | 372 | ||
373 | list_for_each_entry(attr, &acpi_table_attr_list, node) { | 373 | list_for_each_entry(attr, &acpi_table_attr_list, node) { |
374 | if (ACPI_COMPARE_NAME(table_attr->name, attr->name)) | 374 | if (ACPI_COMPARE_NAMESEG(table_attr->name, attr->name)) |
375 | if (table_attr->instance < attr->instance) | 375 | if (table_attr->instance < attr->instance) |
376 | table_attr->instance = attr->instance; | 376 | table_attr->instance = attr->instance; |
377 | } | 377 | } |
@@ -382,7 +382,7 @@ static int acpi_table_attr_init(struct kobject *tables_obj, | |||
382 | return -ERANGE; | 382 | return -ERANGE; |
383 | } | 383 | } |
384 | 384 | ||
385 | ACPI_MOVE_NAME(table_attr->filename, table_header->signature); | 385 | ACPI_COPY_NAMESEG(table_attr->filename, table_header->signature); |
386 | table_attr->filename[ACPI_NAME_SIZE] = '\0'; | 386 | table_attr->filename[ACPI_NAME_SIZE] = '\0'; |
387 | if (table_attr->instance > 1 || (table_attr->instance == 1 && | 387 | if (table_attr->instance > 1 || (table_attr->instance == 1 && |
388 | !acpi_get_table | 388 | !acpi_get_table |
@@ -484,7 +484,7 @@ static int acpi_table_data_init(struct acpi_table_header *th) | |||
484 | int i; | 484 | int i; |
485 | 485 | ||
486 | for (i = 0; i < NUM_ACPI_DATA_OBJS; i++) { | 486 | for (i = 0; i < NUM_ACPI_DATA_OBJS; i++) { |
487 | if (ACPI_COMPARE_NAME(th->signature, acpi_data_objs[i].name)) { | 487 | if (ACPI_COMPARE_NAMESEG(th->signature, acpi_data_objs[i].name)) { |
488 | data_attr = kzalloc(sizeof(*data_attr), GFP_KERNEL); | 488 | data_attr = kzalloc(sizeof(*data_attr), GFP_KERNEL); |
489 | if (!data_attr) | 489 | if (!data_attr) |
490 | return -ENOMEM; | 490 | return -ENOMEM; |