summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2016-12-28 02:28:07 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-01-02 17:18:34 -0500
commit703ecd220d57247360f64ae0c5a08d1f2355794a (patch)
tree8447f53d5bf1d377a423347e8e36c3c379061475
parent0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff)
ACPICA: Debugger: Rename debugger OSL names
ACPICA commit e76eb8b36ace880e4d475880db1128a206e57b6f This linuxized ACPICA commit is a back port result of the following linux commit: Commit: f8d31489629c125806ce4bf587c0c5c284d6d113 Subject: ACPICA: Debugger: Convert some mechanisms to OSPM specific During the back porting, it is requested by ACPICA to use expected OSL names. Suggested by Bob Moore, Fixed by Lv Zheng. Linux is not affected by this patch. Link: https://github.com/acpica/acpica/commit/e76eb8b3 Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/dbxface.c4
-rw-r--r--include/acpi/acpiosxf.h8
-rw-r--r--include/acpi/platform/aclinux.h4
-rw-r--r--include/acpi/platform/aclinuxex.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/acpi/acpica/dbxface.c b/drivers/acpi/acpica/dbxface.c
index 124db237775d..5b8cae1796cb 100644
--- a/drivers/acpi/acpica/dbxface.c
+++ b/drivers/acpi/acpica/dbxface.c
@@ -430,7 +430,7 @@ acpi_status acpi_initialize_debugger(void)
430 430
431 /* These were created with one unit, grab it */ 431 /* These were created with one unit, grab it */
432 432
433 status = acpi_os_initialize_command_signals(); 433 status = acpi_os_initialize_debugger();
434 if (ACPI_FAILURE(status)) { 434 if (ACPI_FAILURE(status)) {
435 acpi_os_printf("Could not get debugger mutex\n"); 435 acpi_os_printf("Could not get debugger mutex\n");
436 return_ACPI_STATUS(status); 436 return_ACPI_STATUS(status);
@@ -482,7 +482,7 @@ void acpi_terminate_debugger(void)
482 acpi_os_sleep(100); 482 acpi_os_sleep(100);
483 } 483 }
484 484
485 acpi_os_terminate_command_signals(); 485 acpi_os_terminate_debugger();
486 } 486 }
487 487
488 if (acpi_gbl_db_buffer) { 488 if (acpi_gbl_db_buffer) {
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index f3414c83abb1..42ab9b37f33d 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -355,12 +355,12 @@ void acpi_os_redirect_output(void *destination);
355acpi_status acpi_os_get_line(char *buffer, u32 buffer_length, u32 *bytes_read); 355acpi_status acpi_os_get_line(char *buffer, u32 buffer_length, u32 *bytes_read);
356#endif 356#endif
357 357
358#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_command_signals 358#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_debugger
359acpi_status acpi_os_initialize_command_signals(void); 359acpi_status acpi_os_initialize_debugger(void);
360#endif 360#endif
361 361
362#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_command_signals 362#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_debugger
363void acpi_os_terminate_command_signals(void); 363void acpi_os_terminate_debugger(void);
364#endif 364#endif
365 365
366#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_wait_command_ready 366#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_wait_command_ready
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index e861a24f06f2..af588e0d2e99 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -156,8 +156,8 @@
156 */ 156 */
157#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_readable 157#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_readable
158#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_writable 158#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_writable
159#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_command_signals 159#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_debugger
160#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_command_signals 160#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_debugger
161 161
162/* 162/*
163 * OSL interfaces used by utilities 163 * OSL interfaces used by utilities
diff --git a/include/acpi/platform/aclinuxex.h b/include/acpi/platform/aclinuxex.h
index 7dbb1141f546..de7648b4c729 100644
--- a/include/acpi/platform/aclinuxex.h
+++ b/include/acpi/platform/aclinuxex.h
@@ -129,12 +129,12 @@ static inline u8 acpi_os_readable(void *pointer, acpi_size length)
129 return TRUE; 129 return TRUE;
130} 130}
131 131
132static inline acpi_status acpi_os_initialize_command_signals(void) 132static inline acpi_status acpi_os_initialize_debugger(void)
133{ 133{
134 return AE_OK; 134 return AE_OK;
135} 135}
136 136
137static inline void acpi_os_terminate_command_signals(void) 137static inline void acpi_os_terminate_debugger(void)
138{ 138{
139 return; 139 return;
140} 140}