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

Commit 02f1f217 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

kernel.h: remove ancient __FUNCTION__ hack 



__FUNCTION__ hasn't been treated as a string literal since gcc 3.4, so
this only helps people who only test-compile using 3.3 (compiler-gcc3.h
barks at anything older than that).  Besides, there are almost no
occurrences of __FUNCTION__ left in the tree.

[akpm@linux-foundation.org: convert remaining __FUNCTION__ references]
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4be1b297

arch/x86/kernel/hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void _hpet_print_config(const char *function, int line) 
#define hpet_print_config()					\

do {								\

	if (hpet_verbose)					\

		_hpet_print_config(__FUNCTION__, __LINE__);	\

		_hpet_print_config(__func__, __LINE__);	\

} while (0)



/*

arch/x86/kernel/rtc.c

+2 −2
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ int mach_set_rtc_mmss(const struct timespec *now) 
		retval = set_rtc_time(&tm);

		if (retval)

			printk(KERN_ERR "%s: RTC write failed with error %d\n",

			       __FUNCTION__, retval);

			       __func__, retval);

	} else {

		printk(KERN_ERR

		       "%s: Invalid RTC value: write of %lx to RTC failed\n",

			__FUNCTION__, nowtime);

			__func__, nowtime);

		retval = -EINVAL;

	}

	return retval;

arch/x86/platform/intel-mid/intel_mid_vrtc.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int vrtc_set_mmss(const struct timespec *now) 
		spin_unlock_irqrestore(&rtc_lock, flags);

	} else {

		pr_err("%s: Invalid vRTC value: write of %lx to vRTC failed\n",

			__FUNCTION__, now->tv_sec);

			__func__, now->tv_sec);

		retval = -EINVAL;

	}

	return retval;

drivers/acpi/acpica/utdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ 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

 *              with no change to the debug output.

 *              This allows compiler macros such as __func__ to be used with no

 *              change to the debug output.

 *

 ******************************************************************************/

drivers/block/xen-blkfront.c

+1 −1
Original line number Diff line number Diff line
@@ -1391,7 +1391,7 @@ static int blkfront_probe(struct xenbus_device *dev, 
			if (major != XENVBD_MAJOR) {

				printk(KERN_INFO

						"%s: HVM does not support vbd %d as xen block device\n",

						__FUNCTION__, vdevice);

						__func__, vdevice);

				return -ENODEV;

			}

		}