diff options
22 files changed, 30 insertions, 30 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index b54dad505f8..7e8ceea9b5d 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 d6b61d56b65..2f62a9f4058 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 cf4bc0d8335..1452391fe95 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 | ||
897 | static int __init stamp_init(void) | 897 | static 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 97378b0a975..39c3dd3d595 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 = { | |||
411 | static int __init H8606_init(void) | 411 | static 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 886f260d935..7e7b7c9a5c8 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 | ||
356 | static int __init cm_bf533_init(void) | 356 | static 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 241b5a20a36..35c1efdf8e1 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 | ||
370 | static int __init ezkit_init(void) | 370 | static 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 e359a0d6467..82b1f6a60e3 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 | ||
85 | static int __init generic_board_init(void) | 85 | static 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 32b37afc6e6..3a727d3676e 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 b575b23fe69..199fde69b96 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 | ||
452 | static int __init cm_bf537_init(void) | 452 | static 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 c95395ba7bf..b3d78ea755c 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 | ||
691 | static int __init stamp_init(void) | 691 | static 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 d71e0be3392..815ad404588 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 | ||
298 | static int __init minotaur_init(void) | 298 | static 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 509a8a236fd..0b3e22b1b68 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 | ||
498 | static int __init stamp_init(void) | 498 | static 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 f81a9b8a640..e95478252c8 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 | ||
855 | static int __init stamp_init(void) | 855 | static 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 04c0c8df6e9..acbfb0fc028 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 | ||
696 | static int __init ezkit_init(void) | 696 | static 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 bf9e738a7c6..4a3e0853f2a 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 | ||
350 | static int __init cm_bf561_init(void) | 350 | static 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 79a55b42e96..984d654cc8d 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 fc80c5d059f..2faa0072d61 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 | ||
71 | static int __init generic_board_init(void) | 71 | static 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 ec6a2207c20..c9174b39f98 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 | ||
51 | static int __init tepla_init(void) | 51 | static 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 225ef14af75..a2a11717bf6 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 cb8b8d5af34..0f6d303a889 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 872dffe3362..d1c698bb9ee 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; |
diff --git a/include/asm-blackfin/uaccess.h b/include/asm-blackfin/uaccess.h index 22a410b8003..d928b809905 100644 --- a/include/asm-blackfin/uaccess.h +++ b/include/asm-blackfin/uaccess.h | |||
@@ -133,7 +133,7 @@ static inline int bad_user_access_length(void) | |||
133 | } | 133 | } |
134 | 134 | ||
135 | #define __put_user_bad() (printk(KERN_INFO "put_user_bad %s:%d %s\n",\ | 135 | #define __put_user_bad() (printk(KERN_INFO "put_user_bad %s:%d %s\n",\ |
136 | __FILE__, __LINE__, __FUNCTION__),\ | 136 | __FILE__, __LINE__, __func__),\ |
137 | bad_user_access_length(), (-EFAULT)) | 137 | bad_user_access_length(), (-EFAULT)) |
138 | 138 | ||
139 | /* | 139 | /* |
@@ -177,7 +177,7 @@ static inline int bad_user_access_length(void) | |||
177 | default: \ | 177 | default: \ |
178 | x = 0; \ | 178 | x = 0; \ |
179 | printk(KERN_INFO "get_user_bad: %s:%d %s\n", \ | 179 | printk(KERN_INFO "get_user_bad: %s:%d %s\n", \ |
180 | __FILE__, __LINE__, __FUNCTION__); \ | 180 | __FILE__, __LINE__, __func__); \ |
181 | _err = __get_user_bad(); \ | 181 | _err = __get_user_bad(); \ |
182 | break; \ | 182 | break; \ |
183 | } \ | 183 | } \ |