Commit b85d858b authored by Harvey Harrison's avatar Harvey Harrison Committed by Bryan Wu
Browse files

[Blackfin] arch: __FUNCTION__ is gcc-specific, use __func__ 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>

Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 6b13483b

arch/blackfin/kernel/bfin_gpio.c

+4 −4
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ int peripheral_request(unsigned short per, const char *label) 
		dump_stack();

		printk(KERN_ERR

		    "%s: Peripheral %d is already reserved as GPIO by %s !\n",

		       __FUNCTION__, ident, get_label(ident));

		       __func__, ident, get_label(ident));

		local_irq_restore(flags);

		return -EBUSY;

	}
@@ -848,7 +848,7 @@ int peripheral_request(unsigned short per, const char *label) 
			dump_stack();

			printk(KERN_ERR

			       "%s: Peripheral %d function %d is already reserved by %s !\n",

			       __FUNCTION__, ident, P_FUNCT2MUX(per), get_label(ident));

			       __func__, ident, P_FUNCT2MUX(per), get_label(ident));

			local_irq_restore(flags);

			return -EBUSY;

		}
@@ -891,7 +891,7 @@ int peripheral_request(unsigned short per, const char *label) 
			dump_stack();

			printk(KERN_ERR

			       "%s: Peripheral %d is already reserved as GPIO by %s !\n",

			       __FUNCTION__, ident, get_label(ident));

			       __func__, ident, get_label(ident));

			local_irq_restore(flags);

			return -EBUSY;

		}
@@ -919,7 +919,7 @@ int peripheral_request(unsigned short per, const char *label) 
			printk(KERN_ERR

			       "%s: Peripheral %d function %d is already"

			       " reserved by %s !\n",

			       __FUNCTION__, ident, P_FUNCT2MUX(per),

			       __func__, ident, P_FUNCT2MUX(per),

				get_label(ident));

			local_irq_restore(flags);

			return -EBUSY;

arch/blackfin/kernel/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void dma_alloc_init(unsigned long start, unsigned long end) 
	memset((void *)dma_base, 0, DMA_UNCACHED_REGION);

	dma_initialized = 1;



	printk(KERN_INFO "%s: dma_page @ 0x%p - %d pages at 0x%08lx\n", __FUNCTION__,

	printk(KERN_INFO "%s: dma_page @ 0x%p - %d pages at 0x%08lx\n", __func__,

	       dma_page, dma_pages, dma_base);

}
@@ -100,7 +100,7 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages) 
	int i;



	if ((page + pages) > dma_pages) {

		printk(KERN_ERR "%s: freeing outside range.\n", __FUNCTION__);

		printk(KERN_ERR "%s: freeing outside range.\n", __func__);

		BUG();

	}

arch/blackfin/mach-bf527/boards/ezkit.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int __init bfin_isp1761_init(void) 
{

	unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);



	printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);

	printk(KERN_INFO "%s(): registering device resources\n", __func__);

	set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);



	return platform_add_devices(bfin_isp1761_devices, num_devices);
@@ -896,7 +896,7 @@ static struct platform_device *stamp_devices[] __initdata = { 


static int __init stamp_init(void)

{

	printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);

	printk(KERN_INFO "%s(): registering device resources\n", __func__);

	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	spi_register_board_info(bfin_spi_board_info,

arch/blackfin/mach-bf533/boards/H8606.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static struct platform_device *h8606_devices[] __initdata = { 
static int __init H8606_init(void)

{

	printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n");

	printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);

	printk(KERN_INFO "%s(): registering device resources\n", __func__);

	platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices));

#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

arch/blackfin/mach-bf533/boards/cm_bf533.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static struct platform_device *cm_bf533_devices[] __initdata = { 


static int __init cm_bf533_init(void)

{

	printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);

	printk(KERN_INFO "%s(): registering device resources\n", __func__);

	platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices));

#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

CRA Git | Maintained and supported by SUSTech CRA and CCSE