Skip to content

Commit

Permalink
[Blackfin] arch: __FUNCTION__ is gcc-specific, use __func__
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@hharrison
hharrison authored and Bryan Wu committed Apr 23, 2008
1 parent 6b13483 commit b85d858
Show file tree
Hide file tree
Showing 22 changed files with 30 additions and 30 deletions.
8 changes: 4 additions & 4 deletions arch/blackfin/kernel/bfin_gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/kernel/dma-mapping.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/mach-bf527/boards/ezkit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf533/boards/H8606.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf533/boards/cm_bf533.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf533/boards/ezkit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ static struct platform_device *ezkit_devices[] __initdata = {

static int __init ezkit_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_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));
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf533/boards/generic_board.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static struct platform_device *generic_board_devices[] __initdata = {

static int __init generic_board_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);
return platform_add_devices(generic_board_devices, ARRAY_SIZE(generic_board_devices));
}

Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf533/boards/stamp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ static int __init stamp_init(void)
{
int ret;

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

#ifdef CONFIG_I2C_BOARDINFO
i2c_register_board_info(0, bfin_i2c_board_info,
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf537/boards/cm_bf537.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = {

static int __init cm_bf537_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_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));
Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/mach-bf537/boards/generic_board.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,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);
Expand Down Expand Up @@ -690,7 +690,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,
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf537/boards/minotaur.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ static struct platform_device *minotaur_devices[] __initdata = {

static int __init minotaur_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(minotaur_devices, ARRAY_SIZE(minotaur_devices));
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
spi_register_board_info(bfin_spi_board_info,
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf537/boards/pnav10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,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,
Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/mach-bf537/boards/stamp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,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);
Expand Down Expand Up @@ -854,7 +854,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__);

#ifdef CONFIG_I2C_BOARDINFO
i2c_register_board_info(0, bfin_i2c_board_info,
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf548/boards/ezkit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ static struct platform_device *ezkit_devices[] __initdata = {

static int __init ezkit_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);

#ifdef CONFIG_I2C_BOARDINFO
i2c_register_board_info(0, bfin_i2c_board_info0,
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf561/boards/cm_bf561.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static struct platform_device *cm_bf561_devices[] __initdata = {

static int __init cm_bf561_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf561_devices, ARRAY_SIZE(cm_bf561_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));
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf561/boards/ezkit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,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);
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf561/boards/generic_board.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static struct platform_device *generic_board_devices[] __initdata = {

static int __init generic_board_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);
return platform_add_devices(generic_board_devices,
ARRAY_SIZE(generic_board_devices));
}
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf561/boards/tepla.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static struct platform_device *tepla_devices[] __initdata = {

static int __init tepla_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
printk(KERN_INFO "%s(): registering device resources\n", __func__);
return platform_add_devices(tepla_devices, ARRAY_SIZE(tepla_devices));
}

Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-common/ints-priority.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ static void bfin_demux_error_irq(unsigned int int_err_irq,
printk(KERN_ERR
"%s : %s : LINE %d :\nIRQ ?: PERIPHERAL ERROR"
" INTERRUPT ASSERTED BUT NO SOURCE FOUND\n",
__FUNCTION__, __FILE__, __LINE__);
__func__, __FILE__, __LINE__);

}
#endif /* BF537_GENERIC_ERROR_INT_DEMUX */
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/oprofile/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static int op_bfin_start(void)
{
int ret = -EBUSY;

printk(KERN_INFO "KSDBG:in %s\n", __FUNCTION__);
printk(KERN_INFO "KSDBG:in %s\n", __func__);
mutex_lock(&pfmon_lock);
if (!pfmon_enabled) {
ret = model->start(ctr);
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/oprofile/op_model_bf533.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ int pm_overflow_handler(int irq, struct pt_regs *regs)
unsigned int pc, pfctl;
unsigned int count[2];

pr_debug("get interrupt in %s\n", __FUNCTION__);
pr_debug("get interrupt in %s\n", __func__);
if (oprofile_running == 0) {
pr_debug("error: entering interrupt when oprofile is stopped.\n\r");
return -1;
Expand Down
4 changes: 2 additions & 2 deletions include/asm-blackfin/uaccess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static inline int bad_user_access_length(void)
}

#define __put_user_bad() (printk(KERN_INFO "put_user_bad %s:%d %s\n",\
__FILE__, __LINE__, __FUNCTION__),\
__FILE__, __LINE__, __func__),\
bad_user_access_length(), (-EFAULT))

/*
Expand Down Expand Up @@ -177,7 +177,7 @@ static inline int bad_user_access_length(void)
default: \
x = 0; \
printk(KERN_INFO "get_user_bad: %s:%d %s\n", \
__FILE__, __LINE__, __FUNCTION__); \
__FILE__, __LINE__, __func__); \
_err = __get_user_bad(); \
break; \
} \
Expand Down

0 comments on commit b85d858

Please sign in to comment.