Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 23:29:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel.h: remove ancient __FUNCTION__ hack

Browse Source 
__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: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rasmus Villemoes 2015-02-12 15:01:31 -08:00 committed by Linus Torvalds
parent 4be1b29795
commit 02f1f2170d
7 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/hpet.c
View File

@ -168,7 +168,7 @@ static void _hpet_print_config(const char *function, int line)
#define hpet_print_config() \ #define hpet_print_config() \
do { \ do { \
if (hpet_verbose) \ if (hpet_verbose) \
_hpet_print_config(__FUNCTION__, __LINE__); \ _hpet_print_config(__func__, __LINE__); \
} while (0) } while (0)
/* /*

4
arch/x86/kernel/rtc.c
View File

@ -49,11 +49,11 @@ int mach_set_rtc_mmss(const struct timespec *now)
retval = set_rtc_time(&tm); retval = set_rtc_time(&tm);
if (retval) if (retval)
printk(KERN_ERR "%s: RTC write failed with error %d\n", printk(KERN_ERR "%s: RTC write failed with error %d\n",
__FUNCTION__, retval); __func__, retval);
} else { } else {
printk(KERN_ERR printk(KERN_ERR
"%s: Invalid RTC value: write of %lx to RTC failed\n", "%s: Invalid RTC value: write of %lx to RTC failed\n",
__FUNCTION__, nowtime); __func__, nowtime);
retval = -EINVAL; retval = -EINVAL;
} }
return retval; return retval;

2
arch/x86/platform/intel-mid/intel_mid_vrtc.c
View File

@ -110,7 +110,7 @@ int vrtc_set_mmss(const struct timespec *now)
spin_unlock_irqrestore(&rtc_lock, flags); spin_unlock_irqrestore(&rtc_lock, flags);
} else { } else {
pr_err("%s: Invalid vRTC value: write of %lx to vRTC failed\n", pr_err("%s: Invalid vRTC value: write of %lx to vRTC failed\n",
__FUNCTION__, now->tv_sec); __func__, now->tv_sec);
retval = -EINVAL; retval = -EINVAL;
} }
return retval; return retval;

4
drivers/acpi/acpica/utdebug.c
View File

@ -111,8 +111,8 @@ 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
* with no change to the debug output. * change to the debug output.
* *
******************************************************************************/ ******************************************************************************/

2
drivers/block/xen-blkfront.c
View File

@ -1391,7 +1391,7 @@ static int blkfront_probe(struct xenbus_device *dev,
if (major != XENVBD_MAJOR) { if (major != XENVBD_MAJOR) {
printk(KERN_INFO printk(KERN_INFO
"%s: HVM does not support vbd %d as xen block device\n", "%s: HVM does not support vbd %d as xen block device\n",
__FUNCTION__, vdevice); __func__, vdevice);
return -ENODEV; return -ENODEV;
} }
} }

6
include/acpi/acoutput.h
View File

@ -240,7 +240,7 @@
/* /*
* If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header, * If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header,
* define it now. This is the case where there the compiler does not support * define it now. This is the case where there the compiler does not support
* a __FUNCTION__ macro or equivalent. * a __func__ macro or equivalent.
*/ */
#ifndef ACPI_GET_FUNCTION_NAME #ifndef ACPI_GET_FUNCTION_NAME
#define ACPI_GET_FUNCTION_NAME _acpi_function_name #define ACPI_GET_FUNCTION_NAME _acpi_function_name
@ -249,12 +249,12 @@
* The Name parameter should be the procedure name as a quoted string. * The Name parameter should be the procedure name as a quoted string.
* The function name is also used by the function exit macros below. * The function name is also used by the function exit macros below.
* Note: (const char) is used to be compatible with the debug interfaces * Note: (const char) is used to be compatible with the debug interfaces
* and macros such as __FUNCTION__. * and macros such as __func__.
*/ */
#define ACPI_FUNCTION_NAME(name) static const char _acpi_function_name[] = #name; #define ACPI_FUNCTION_NAME(name) static const char _acpi_function_name[] = #name;
#else #else
/* Compiler supports __FUNCTION__ (or equivalent) -- Ignore this macro */ /* Compiler supports __func__ (or equivalent) -- Ignore this macro */
#define ACPI_FUNCTION_NAME(name) #define ACPI_FUNCTION_NAME(name)
#endif /* ACPI_GET_FUNCTION_NAME */ #endif /* ACPI_GET_FUNCTION_NAME */

3
include/linux/kernel.h
View File

@ -800,9 +800,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
const typeof( ((type *)0)->member ) *__mptr = (ptr); \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );}) (type *)( (char *)__mptr - offsetof(type,member) );})
/* Trap pasters of __FUNCTION__ at compile-time */
#define __FUNCTION__ (__func__)
/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
#ifdef CONFIG_FTRACE_MCOUNT_RECORD #ifdef CONFIG_FTRACE_MCOUNT_RECORD
# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD