From: Harvey Harrison __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/acpi/bus.c | 2 +- drivers/acpi/scan.c | 2 +- drivers/acpi/sleep/main.c | 2 +- drivers/acpi/utilities/utdebug.c | 2 +- drivers/acpi/video.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/acpi/bus.c~acpi-replace-remaining-__function__-occurrences drivers/acpi/bus.c --- a/drivers/acpi/bus.c~acpi-replace-remaining-__function__-occurrences +++ a/drivers/acpi/bus.c @@ -776,7 +776,7 @@ static int __init acpi_init(void) acpi_kobj = kobject_create_and_add("acpi", firmware_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; } diff -puN drivers/acpi/scan.c~acpi-replace-remaining-__function__-occurrences drivers/acpi/scan.c --- a/drivers/acpi/scan.c~acpi-replace-remaining-__function__-occurrences +++ a/drivers/acpi/scan.c @@ -967,7 +967,7 @@ static void acpi_device_set_id(struct ac case ACPI_BUS_TYPE_DEVICE: status = acpi_get_object_info(handle, &buffer); 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; } diff -puN drivers/acpi/sleep/main.c~acpi-replace-remaining-__function__-occurrences drivers/acpi/sleep/main.c --- a/drivers/acpi/sleep/main.c~acpi-replace-remaining-__function__-occurrences +++ a/drivers/acpi/sleep/main.c @@ -504,7 +504,7 @@ static void acpi_power_off_prepare(void) static void acpi_power_off(void) { /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ - printk("%s called\n", __FUNCTION__); + printk("%s called\n", __func__); local_irq_disable(); acpi_enable_wakeup_device(ACPI_STATE_S5); acpi_enter_sleep_state(ACPI_STATE_S5); diff -puN drivers/acpi/utilities/utdebug.c~acpi-replace-remaining-__function__-occurrences drivers/acpi/utilities/utdebug.c --- a/drivers/acpi/utilities/utdebug.c~acpi-replace-remaining-__function__-occurrences +++ a/drivers/acpi/utilities/utdebug.c @@ -109,7 +109,7 @@ void acpi_ut_track_stack_ptr(void) * RETURN: Updated pointer to the function name * * 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. * ******************************************************************************/ diff -puN drivers/acpi/video.c~acpi-replace-remaining-__function__-occurrences drivers/acpi/video.c --- a/drivers/acpi/video.c~acpi-replace-remaining-__function__-occurrences +++ a/drivers/acpi/video.c @@ -1201,7 +1201,7 @@ static int acpi_video_bus_ROM_seq_show(s if (!video) goto end; - printk(KERN_INFO PREFIX "Please implement %s\n", __FUNCTION__); + printk(KERN_INFO PREFIX "Please implement %s\n", __func__); seq_printf(seq, "\n"); end: _