Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b2dd1f authored Mar 05, 2008 by Harvey Harrison Committed by Len Brown Mar 11, 2008

ACPI: replace remaining FUNCTION occurrences



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>

parent bd12935f

drivers/acpi/bus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/acpi/scan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -966,7 +966,7 @@ static void acpi_device_set_id(struct acpi_device *device,
		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;
		}

drivers/acpi/sleep/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/acpi/utilities/utdebug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.
		*
		******************************************************************************/

drivers/acpi/video.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1201,7 +1201,7 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file seq, void offset)
		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, "<TODO>\n");

		end: