diff options
Diffstat (limited to 'drivers/acpi/utilities/utstate.c')
-rw-r--r-- | drivers/acpi/utilities/utstate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/utilities/utstate.c index 69f2bfdc26ab..637c5f964879 100644 --- a/drivers/acpi/utilities/utstate.c +++ b/drivers/acpi/utilities/utstate.c | |||
@@ -162,7 +162,7 @@ union acpi_generic_state *acpi_ut_create_generic_state(void) | |||
162 | 162 | ||
163 | /* Initialize */ | 163 | /* Initialize */ |
164 | memset(state, 0, sizeof(union acpi_generic_state)); | 164 | memset(state, 0, sizeof(union acpi_generic_state)); |
165 | state->common.data_type = ACPI_DESC_TYPE_STATE; | 165 | state->common.descriptor_type = ACPI_DESC_TYPE_STATE; |
166 | } | 166 | } |
167 | 167 | ||
168 | return (state); | 168 | return (state); |
@@ -196,7 +196,7 @@ struct acpi_thread_state *acpi_ut_create_thread_state(void) | |||
196 | 196 | ||
197 | /* Init fields specific to the update struct */ | 197 | /* Init fields specific to the update struct */ |
198 | 198 | ||
199 | state->common.data_type = ACPI_DESC_TYPE_STATE_THREAD; | 199 | state->common.descriptor_type = ACPI_DESC_TYPE_STATE_THREAD; |
200 | state->thread.thread_id = acpi_os_get_thread_id(); | 200 | state->thread.thread_id = acpi_os_get_thread_id(); |
201 | 201 | ||
202 | return_PTR((struct acpi_thread_state *)state); | 202 | return_PTR((struct acpi_thread_state *)state); |
@@ -233,7 +233,7 @@ union acpi_generic_state *acpi_ut_create_update_state(union acpi_operand_object | |||
233 | 233 | ||
234 | /* Init fields specific to the update struct */ | 234 | /* Init fields specific to the update struct */ |
235 | 235 | ||
236 | state->common.data_type = ACPI_DESC_TYPE_STATE_UPDATE; | 236 | state->common.descriptor_type = ACPI_DESC_TYPE_STATE_UPDATE; |
237 | state->update.object = object; | 237 | state->update.object = object; |
238 | state->update.value = action; | 238 | state->update.value = action; |
239 | 239 | ||
@@ -270,7 +270,7 @@ union acpi_generic_state *acpi_ut_create_pkg_state(void *internal_object, | |||
270 | 270 | ||
271 | /* Init fields specific to the update struct */ | 271 | /* Init fields specific to the update struct */ |
272 | 272 | ||
273 | state->common.data_type = ACPI_DESC_TYPE_STATE_PACKAGE; | 273 | state->common.descriptor_type = ACPI_DESC_TYPE_STATE_PACKAGE; |
274 | state->pkg.source_object = (union acpi_operand_object *)internal_object; | 274 | state->pkg.source_object = (union acpi_operand_object *)internal_object; |
275 | state->pkg.dest_object = external_object; | 275 | state->pkg.dest_object = external_object; |
276 | state->pkg.index = index; | 276 | state->pkg.index = index; |
@@ -307,7 +307,7 @@ union acpi_generic_state *acpi_ut_create_control_state(void) | |||
307 | 307 | ||
308 | /* Init fields specific to the control struct */ | 308 | /* Init fields specific to the control struct */ |
309 | 309 | ||
310 | state->common.data_type = ACPI_DESC_TYPE_STATE_CONTROL; | 310 | state->common.descriptor_type = ACPI_DESC_TYPE_STATE_CONTROL; |
311 | state->common.state = ACPI_CONTROL_CONDITIONAL_EXECUTING; | 311 | state->common.state = ACPI_CONTROL_CONDITIONAL_EXECUTING; |
312 | 312 | ||
313 | return_PTR(state); | 313 | return_PTR(state); |