Commit 96b2dd1f authored by Harvey Harrison's avatar Harvey Harrison Committed by Len Brown

ACPI: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent bd12935f
...@@ -776,7 +776,7 @@ static int __init acpi_init(void) ...@@ -776,7 +776,7 @@ static int __init acpi_init(void)
acpi_kobj = kobject_create_and_add("acpi", firmware_kobj); acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);
if (!acpi_kobj) { if (!acpi_kobj) {
printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__); printk(KERN_WARNING "%s: kset create error\n", __func__);
acpi_kobj = NULL; acpi_kobj = NULL;
} }
......
...@@ -966,7 +966,7 @@ static void acpi_device_set_id(struct acpi_device *device, ...@@ -966,7 +966,7 @@ static void acpi_device_set_id(struct acpi_device *device,
case ACPI_BUS_TYPE_DEVICE: case ACPI_BUS_TYPE_DEVICE:
status = acpi_get_object_info(handle, &buffer); status = acpi_get_object_info(handle, &buffer);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
printk(KERN_ERR PREFIX "%s: Error reading device info\n", __FUNCTION__); printk(KERN_ERR PREFIX "%s: Error reading device info\n", __func__);
return; return;
} }
......
...@@ -504,7 +504,7 @@ static void acpi_power_off_prepare(void) ...@@ -504,7 +504,7 @@ static void acpi_power_off_prepare(void)
static void acpi_power_off(void) static void acpi_power_off(void)
{ {
/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
printk("%s called\n", __FUNCTION__); printk("%s called\n", __func__);
local_irq_disable(); local_irq_disable();
acpi_enable_wakeup_device(ACPI_STATE_S5); acpi_enable_wakeup_device(ACPI_STATE_S5);
acpi_enter_sleep_state(ACPI_STATE_S5); acpi_enter_sleep_state(ACPI_STATE_S5);
......
...@@ -109,7 +109,7 @@ void acpi_ut_track_stack_ptr(void) ...@@ -109,7 +109,7 @@ void acpi_ut_track_stack_ptr(void)
* RETURN: Updated pointer to the function name * RETURN: Updated pointer to the function name
* *
* DESCRIPTION: Remove the "Acpi" prefix from the function name, if present. * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.
* This allows compiler macros such as __FUNCTION__ to be used * This allows compiler macros such as __func__ to be used
* with no change to the debug output. * with no change to the debug output.
* *
******************************************************************************/ ******************************************************************************/
......
...@@ -1201,7 +1201,7 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset) ...@@ -1201,7 +1201,7 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)
if (!video) if (!video)
goto end; goto end;
printk(KERN_INFO PREFIX "Please implement %s\n", __FUNCTION__); printk(KERN_INFO PREFIX "Please implement %s\n", __func__);
seq_printf(seq, "<TODO>\n"); seq_printf(seq, "<TODO>\n");
end: end:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment