aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-22 21:39:01 -0400
committerBryan Wu <cooloney@kernel.org>2008-04-22 21:39:01 -0400
commitb85d858b40a28107ee50ca9e89f57c0e35c251c6 (patch)
tree96f1a2a344529e820fb0f256331070be3d83e600 /arch
parent6b13483ba2c9c90fc34c79b44be418b56b6a756c (diff)
[Blackfin] arch: __FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/kernel/bfin_gpio.c8
-rw-r--r--arch/blackfin/kernel/dma-mapping.c4
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c4
-rw-r--r--arch/blackfin/mach-bf533/boards/H8606.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/cm_bf533.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/generic_board.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/stamp.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/cm_bf537.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/generic_board.c4
-rw-r--r--arch/blackfin/mach-bf537/boards/minotaur.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c4
-rw-r--r--arch/blackfin/mach-bf548/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/cm_bf561.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/generic_board.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/tepla.c2
-rw-r--r--arch/blackfin/mach-common/ints-priority.c2
-rw-r--r--arch/blackfin/oprofile/common.c2
-rw-r--r--arch/blackfin/oprofile/op_model_bf533.c2
21 files changed, 28 insertions, 28 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index b54dad505f83..7e8ceea9b5d1 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -821,7 +821,7 @@ int peripheral_request(unsigned short per, const char *label)
821 dump_stack(); 821 dump_stack();
822 printk(KERN_ERR 822 printk(KERN_ERR
823 "%s: Peripheral %d is already reserved as GPIO by %s !\n", 823 "%s: Peripheral %d is already reserved as GPIO by %s !\n",
824 __FUNCTION__, ident, get_label(ident)); 824 __func__, ident, get_label(ident));
825 local_irq_restore(flags); 825 local_irq_restore(flags);
826 return -EBUSY; 826 return -EBUSY;
827 } 827 }
@@ -848,7 +848,7 @@ int peripheral_request(unsigned short per, const char *label)
848 dump_stack(); 848 dump_stack();
849 printk(KERN_ERR 849 printk(KERN_ERR
850 "%s: Peripheral %d function %d is already reserved by %s !\n", 850 "%s: Peripheral %d function %d is already reserved by %s !\n",
851 __FUNCTION__, ident, P_FUNCT2MUX(per), get_label(ident)); 851 __func__, ident, P_FUNCT2MUX(per), get_label(ident));
852 local_irq_restore(flags); 852 local_irq_restore(flags);
853 return -EBUSY; 853 return -EBUSY;
854 } 854 }
@@ -891,7 +891,7 @@ int peripheral_request(unsigned short per, const char *label)
891 dump_stack(); 891 dump_stack();
892 printk(KERN_ERR 892 printk(KERN_ERR
893 "%s: Peripheral %d is already reserved as GPIO by %s !\n", 893 "%s: Peripheral %d is already reserved as GPIO by %s !\n",
894 __FUNCTION__, ident, get_label(ident)); 894 __func__, ident, get_label(ident));
895 local_irq_restore(flags); 895 local_irq_restore(flags);
896 return -EBUSY; 896 return -EBUSY;
897 } 897 }
@@ -919,7 +919,7 @@ int peripheral_request(unsigned short per, const char *label)
919 printk(KERN_ERR 919 printk(KERN_ERR
920 "%s: Peripheral %d function %d is already" 920 "%s: Peripheral %d function %d is already"
921 " reserved by %s !\n", 921 " reserved by %s !\n",
922 __FUNCTION__, ident, P_FUNCT2MUX(per), 922 __func__, ident, P_FUNCT2MUX(per),
923 get_label(ident)); 923 get_label(ident));
924 local_irq_restore(flags); 924 local_irq_restore(flags);
925 return -EBUSY; 925 return -EBUSY;
diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c
index d6b61d56b656..2f62a9f4058a 100644
--- a/arch/blackfin/kernel/dma-mapping.c
+++ b/arch/blackfin/kernel/dma-mapping.c
@@ -59,7 +59,7 @@ void dma_alloc_init(unsigned long start, unsigned long end)
59 memset((void *)dma_base, 0, DMA_UNCACHED_REGION); 59 memset((void *)dma_base, 0, DMA_UNCACHED_REGION);
60 dma_initialized = 1; 60 dma_initialized = 1;
61 61
62 printk(KERN_INFO "%s: dma_page @ 0x%p - %d pages at 0x%08lx\n", __FUNCTION__, 62 printk(KERN_INFO "%s: dma_page @ 0x%p - %d pages at 0x%08lx\n", __func__,
63 dma_page, dma_pages, dma_base); 63 dma_page, dma_pages, dma_base);
64} 64}
65 65
@@ -100,7 +100,7 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages)
100 int i; 100 int i;
101 101
102 if ((page + pages) > dma_pages) { 102 if ((page + pages) > dma_pages) {
103 printk(KERN_ERR "%s: freeing outside range.\n", __FUNCTION__); 103 printk(KERN_ERR "%s: freeing outside range.\n", __func__);
104 BUG(); 104 BUG();
105 } 105 }
106 106
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index cf4bc0d83355..1452391fe95d 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -94,7 +94,7 @@ int __init bfin_isp1761_init(void)
94{ 94{
95 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices); 95 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
96 96
97 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 97 printk(KERN_INFO "%s(): registering device resources\n", __func__);
98 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING); 98 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
99 99
100 return platform_add_devices(bfin_isp1761_devices, num_devices); 100 return platform_add_devices(bfin_isp1761_devices, num_devices);
@@ -896,7 +896,7 @@ static struct platform_device *stamp_devices[] __initdata = {
896 896
897static int __init stamp_init(void) 897static int __init stamp_init(void)
898{ 898{
899 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 899 printk(KERN_INFO "%s(): registering device resources\n", __func__);
900 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); 900 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
901#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 901#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
902 spi_register_board_info(bfin_spi_board_info, 902 spi_register_board_info(bfin_spi_board_info,
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c
index 97378b0a9753..39c3dd3d595c 100644
--- a/arch/blackfin/mach-bf533/boards/H8606.c
+++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -411,7 +411,7 @@ static struct platform_device *h8606_devices[] __initdata = {
411static int __init H8606_init(void) 411static int __init H8606_init(void)
412{ 412{
413 printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n"); 413 printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n");
414 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 414 printk(KERN_INFO "%s(): registering device resources\n", __func__);
415 platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices)); 415 platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices));
416#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 416#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
417 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); 417 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index 886f260d9359..7e7b7c9a5c85 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -355,7 +355,7 @@ static struct platform_device *cm_bf533_devices[] __initdata = {
355 355
356static int __init cm_bf533_init(void) 356static int __init cm_bf533_init(void)
357{ 357{
358 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 358 printk(KERN_INFO "%s(): registering device resources\n", __func__);
359 platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices)); 359 platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices));
360#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 360#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
361 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); 361 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 241b5a20a36a..35c1efdf8e16 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -369,7 +369,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
369 369
370static int __init ezkit_init(void) 370static int __init ezkit_init(void)
371{ 371{
372 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 372 printk(KERN_INFO "%s(): registering device resources\n", __func__);
373 platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); 373 platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));
374#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 374#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
375 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); 375 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
diff --git a/arch/blackfin/mach-bf533/boards/generic_board.c b/arch/blackfin/mach-bf533/boards/generic_board.c
index e359a0d6467f..82b1f6a60e3f 100644
--- a/arch/blackfin/mach-bf533/boards/generic_board.c
+++ b/arch/blackfin/mach-bf533/boards/generic_board.c
@@ -84,7 +84,7 @@ static struct platform_device *generic_board_devices[] __initdata = {
84 84
85static int __init generic_board_init(void) 85static int __init generic_board_init(void)
86{ 86{
87 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 87 printk(KERN_INFO "%s(): registering device resources\n", __func__);
88 return platform_add_devices(generic_board_devices, ARRAY_SIZE(generic_board_devices)); 88 return platform_add_devices(generic_board_devices, ARRAY_SIZE(generic_board_devices));
89} 89}
90 90
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 32b37afc6e6a..3a727d3676e1 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -553,7 +553,7 @@ static int __init stamp_init(void)
553{ 553{
554 int ret; 554 int ret;
555 555
556 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 556 printk(KERN_INFO "%s(): registering device resources\n", __func__);
557 557
558#ifdef CONFIG_I2C_BOARDINFO 558#ifdef CONFIG_I2C_BOARDINFO
559 i2c_register_board_info(0, bfin_i2c_board_info, 559 i2c_register_board_info(0, bfin_i2c_board_info,
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index b575b23fe697..199fde69b964 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -451,7 +451,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
451 451
452static int __init cm_bf537_init(void) 452static int __init cm_bf537_init(void)
453{ 453{
454 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 454 printk(KERN_INFO "%s(): registering device resources\n", __func__);
455 platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices)); 455 platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices));
456#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 456#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
457 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); 457 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index c95395ba7bfa..b3d78ea755ca 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -90,7 +90,7 @@ int __init bfin_isp1761_init(void)
90{ 90{
91 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices); 91 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
92 92
93 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 93 printk(KERN_INFO "%s(): registering device resources\n", __func__);
94 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING); 94 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
95 95
96 return platform_add_devices(bfin_isp1761_devices, num_devices); 96 return platform_add_devices(bfin_isp1761_devices, num_devices);
@@ -690,7 +690,7 @@ static struct platform_device *stamp_devices[] __initdata = {
690 690
691static int __init stamp_init(void) 691static int __init stamp_init(void)
692{ 692{
693 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 693 printk(KERN_INFO "%s(): registering device resources\n", __func__);
694 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); 694 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
695#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 695#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
696 spi_register_board_info(bfin_spi_board_info, 696 spi_register_board_info(bfin_spi_board_info,
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c
index d71e0be33921..815ad404588f 100644
--- a/arch/blackfin/mach-bf537/boards/minotaur.c
+++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -297,7 +297,7 @@ static struct platform_device *minotaur_devices[] __initdata = {
297 297
298static int __init minotaur_init(void) 298static int __init minotaur_init(void)
299{ 299{
300 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 300 printk(KERN_INFO "%s(): registering device resources\n", __func__);
301 platform_add_devices(minotaur_devices, ARRAY_SIZE(minotaur_devices)); 301 platform_add_devices(minotaur_devices, ARRAY_SIZE(minotaur_devices));
302#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 302#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
303 spi_register_board_info(bfin_spi_board_info, 303 spi_register_board_info(bfin_spi_board_info,
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 509a8a236fd0..0b3e22b1b681 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -497,7 +497,7 @@ static struct platform_device *stamp_devices[] __initdata = {
497 497
498static int __init stamp_init(void) 498static int __init stamp_init(void)
499{ 499{
500 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 500 printk(KERN_INFO "%s(): registering device resources\n", __func__);
501 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); 501 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
502#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 502#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
503 spi_register_board_info(bfin_spi_board_info, 503 spi_register_board_info(bfin_spi_board_info,
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index f81a9b8a640e..e95478252c87 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -91,7 +91,7 @@ int __init bfin_isp1761_init(void)
91{ 91{
92 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices); 92 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
93 93
94 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 94 printk(KERN_INFO "%s(): registering device resources\n", __func__);
95 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING); 95 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
96 96
97 return platform_add_devices(bfin_isp1761_devices, num_devices); 97 return platform_add_devices(bfin_isp1761_devices, num_devices);
@@ -854,7 +854,7 @@ static struct platform_device *stamp_devices[] __initdata = {
854 854
855static int __init stamp_init(void) 855static int __init stamp_init(void)
856{ 856{
857 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 857 printk(KERN_INFO "%s(): registering device resources\n", __func__);
858 858
859#ifdef CONFIG_I2C_BOARDINFO 859#ifdef CONFIG_I2C_BOARDINFO
860 i2c_register_board_info(0, bfin_i2c_board_info, 860 i2c_register_board_info(0, bfin_i2c_board_info,
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 04c0c8df6e96..acbfb0fc0289 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -695,7 +695,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
695 695
696static int __init ezkit_init(void) 696static int __init ezkit_init(void)
697{ 697{
698 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 698 printk(KERN_INFO "%s(): registering device resources\n", __func__);
699 699
700#ifdef CONFIG_I2C_BOARDINFO 700#ifdef CONFIG_I2C_BOARDINFO
701 i2c_register_board_info(0, bfin_i2c_board_info0, 701 i2c_register_board_info(0, bfin_i2c_board_info0,
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index bf9e738a7c64..4a3e0853f2a4 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -349,7 +349,7 @@ static struct platform_device *cm_bf561_devices[] __initdata = {
349 349
350static int __init cm_bf561_init(void) 350static int __init cm_bf561_init(void)
351{ 351{
352 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 352 printk(KERN_INFO "%s(): registering device resources\n", __func__);
353 platform_add_devices(cm_bf561_devices, ARRAY_SIZE(cm_bf561_devices)); 353 platform_add_devices(cm_bf561_devices, ARRAY_SIZE(cm_bf561_devices));
354#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 354#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
355 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); 355 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 79a55b42e964..984d654cc8d7 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -78,7 +78,7 @@ int __init bfin_isp1761_init(void)
78{ 78{
79 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices); 79 unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
80 80
81 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 81 printk(KERN_INFO "%s(): registering device resources\n", __func__);
82 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING); 82 set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
83 83
84 return platform_add_devices(bfin_isp1761_devices, num_devices); 84 return platform_add_devices(bfin_isp1761_devices, num_devices);
diff --git a/arch/blackfin/mach-bf561/boards/generic_board.c b/arch/blackfin/mach-bf561/boards/generic_board.c
index fc80c5d059f8..2faa0072d614 100644
--- a/arch/blackfin/mach-bf561/boards/generic_board.c
+++ b/arch/blackfin/mach-bf561/boards/generic_board.c
@@ -70,7 +70,7 @@ static struct platform_device *generic_board_devices[] __initdata = {
70 70
71static int __init generic_board_init(void) 71static int __init generic_board_init(void)
72{ 72{
73 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 73 printk(KERN_INFO "%s(): registering device resources\n", __func__);
74 return platform_add_devices(generic_board_devices, 74 return platform_add_devices(generic_board_devices,
75 ARRAY_SIZE(generic_board_devices)); 75 ARRAY_SIZE(generic_board_devices));
76} 76}
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c
index ec6a2207c202..c9174b39f98d 100644
--- a/arch/blackfin/mach-bf561/boards/tepla.c
+++ b/arch/blackfin/mach-bf561/boards/tepla.c
@@ -50,7 +50,7 @@ static struct platform_device *tepla_devices[] __initdata = {
50 50
51static int __init tepla_init(void) 51static int __init tepla_init(void)
52{ 52{
53 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 53 printk(KERN_INFO "%s(): registering device resources\n", __func__);
54 return platform_add_devices(tepla_devices, ARRAY_SIZE(tepla_devices)); 54 return platform_add_devices(tepla_devices, ARRAY_SIZE(tepla_devices));
55} 55}
56 56
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 225ef14af75e..a2a11717bf66 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -316,7 +316,7 @@ static void bfin_demux_error_irq(unsigned int int_err_irq,
316 printk(KERN_ERR 316 printk(KERN_ERR
317 "%s : %s : LINE %d :\nIRQ ?: PERIPHERAL ERROR" 317 "%s : %s : LINE %d :\nIRQ ?: PERIPHERAL ERROR"
318 " INTERRUPT ASSERTED BUT NO SOURCE FOUND\n", 318 " INTERRUPT ASSERTED BUT NO SOURCE FOUND\n",
319 __FUNCTION__, __FILE__, __LINE__); 319 __func__, __FILE__, __LINE__);
320 320
321} 321}
322#endif /* BF537_GENERIC_ERROR_INT_DEMUX */ 322#endif /* BF537_GENERIC_ERROR_INT_DEMUX */
diff --git a/arch/blackfin/oprofile/common.c b/arch/blackfin/oprofile/common.c
index cb8b8d5af34f..0f6d303a8891 100644
--- a/arch/blackfin/oprofile/common.c
+++ b/arch/blackfin/oprofile/common.c
@@ -75,7 +75,7 @@ static int op_bfin_start(void)
75{ 75{
76 int ret = -EBUSY; 76 int ret = -EBUSY;
77 77
78 printk(KERN_INFO "KSDBG:in %s\n", __FUNCTION__); 78 printk(KERN_INFO "KSDBG:in %s\n", __func__);
79 mutex_lock(&pfmon_lock); 79 mutex_lock(&pfmon_lock);
80 if (!pfmon_enabled) { 80 if (!pfmon_enabled) {
81 ret = model->start(ctr); 81 ret = model->start(ctr);
diff --git a/arch/blackfin/oprofile/op_model_bf533.c b/arch/blackfin/oprofile/op_model_bf533.c
index 872dffe33623..d1c698bb9ee5 100644
--- a/arch/blackfin/oprofile/op_model_bf533.c
+++ b/arch/blackfin/oprofile/op_model_bf533.c
@@ -125,7 +125,7 @@ int pm_overflow_handler(int irq, struct pt_regs *regs)
125 unsigned int pc, pfctl; 125 unsigned int pc, pfctl;
126 unsigned int count[2]; 126 unsigned int count[2];
127 127
128 pr_debug("get interrupt in %s\n", __FUNCTION__); 128 pr_debug("get interrupt in %s\n", __func__);
129 if (oprofile_running == 0) { 129 if (oprofile_running == 0) {
130 pr_debug("error: entering interrupt when oprofile is stopped.\n\r"); 130 pr_debug("error: entering interrupt when oprofile is stopped.\n\r");
131 return -1; 131 return -1;