diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-29 03:59:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:03 -0400 |
commit | 6e574195b75543bc6a6240306313988b1952470c (patch) | |
tree | 510fb98e64cee409cf1f443391cadb5dc1e53aa3 /drivers/misc/sony-laptop.c | |
parent | eecd58536a97502153d4a2bd6f05038f657a1ab3 (diff) |
drivers/misc: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sony-laptop.c')
-rw-r--r-- | drivers/misc/sony-laptop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 02ff3d19b1cc..00e48e2a9c11 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -961,7 +961,7 @@ static int sony_nc_resume(struct acpi_device *device) | |||
961 | ret = acpi_callsetfunc(sony_nc_acpi_handle, *item->acpiset, | 961 | ret = acpi_callsetfunc(sony_nc_acpi_handle, *item->acpiset, |
962 | item->value, NULL); | 962 | item->value, NULL); |
963 | if (ret < 0) { | 963 | if (ret < 0) { |
964 | printk("%s: %d\n", __FUNCTION__, ret); | 964 | printk("%s: %d\n", __func__, ret); |
965 | break; | 965 | break; |
966 | } | 966 | } |
967 | } | 967 | } |
@@ -1453,7 +1453,7 @@ static struct sonypi_eventtypes type4_events[] = { | |||
1453 | udelay(1); \ | 1453 | udelay(1); \ |
1454 | if (!n) \ | 1454 | if (!n) \ |
1455 | dprintk("command failed at %s : %s (line %d)\n", \ | 1455 | dprintk("command failed at %s : %s (line %d)\n", \ |
1456 | __FILE__, __FUNCTION__, __LINE__); \ | 1456 | __FILE__, __func__, __LINE__); \ |
1457 | } | 1457 | } |
1458 | 1458 | ||
1459 | static u8 sony_pic_call1(u8 dev) | 1459 | static u8 sony_pic_call1(u8 dev) |