Commit 8e86f427 authored by Harvey Harrison's avatar Harvey Harrison Committed by Russell King
Browse files

[ARM] replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 92df7851

arch/arm/common/it8152.c

+3 −3
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int it8152_pci_platform_notify_remove(struct device *dev) 
int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)

{

	dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",

		__FUNCTION__, dma_addr, size);

		__func__, dma_addr, size);

	return (dev->bus == &pci_bus_type) &&

		((dma_addr + size - PHYS_OFFSET) >= SZ_64M);

}
@@ -289,7 +289,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) 
 */

int pci_set_dma_mask(struct pci_dev *dev, u64 mask)

{

	dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask);

	dev_dbg(&dev->dev, "%s: %llx\n", __func__, mask);

	if (mask >= PHYS_OFFSET + SZ_64M - 1)

		return 0;
@@ -299,7 +299,7 @@ int pci_set_dma_mask(struct pci_dev *dev, u64 mask) 
int

pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)

{

	dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask);

	dev_dbg(&dev->dev, "%s: %llx\n", __func__, mask);

	if (mask >= PHYS_OFFSET + SZ_64M - 1)

		return 0;

arch/arm/mach-h720x/common.c

+6 −6
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void 
h720x_gpio_handler(unsigned int mask, unsigned int irq,

                 struct irq_desc *desc)

{

	IRQDBG("%s irq: %d\n",__FUNCTION__,irq);

	IRQDBG("%s irq: %d\n", __func__, irq);

	desc = irq_desc + irq;

	while (mask) {

		if (mask & 1) {
@@ -123,7 +123,7 @@ h720x_gpioa_demux_handler(unsigned int irq_unused, struct irq_desc *desc) 


	mask = CPU_REG(GPIO_A_VIRT,GPIO_STAT);

	irq = IRQ_CHAINED_GPIOA(0);

	IRQDBG("%s mask: 0x%08x irq: %d\n",__FUNCTION__,mask,irq);

	IRQDBG("%s mask: 0x%08x irq: %d\n", __func__, mask,irq);

	h720x_gpio_handler(mask, irq, desc);

}
@@ -133,7 +133,7 @@ h720x_gpiob_demux_handler(unsigned int irq_unused, struct irq_desc *desc) 
	unsigned int mask, irq;

	mask = CPU_REG(GPIO_B_VIRT,GPIO_STAT);

	irq = IRQ_CHAINED_GPIOB(0);

	IRQDBG("%s mask: 0x%08x irq: %d\n",__FUNCTION__,mask,irq);

	IRQDBG("%s mask: 0x%08x irq: %d\n", __func__, mask,irq);

	h720x_gpio_handler(mask, irq, desc);

}
@@ -144,7 +144,7 @@ h720x_gpioc_demux_handler(unsigned int irq_unused, struct irq_desc *desc) 


	mask = CPU_REG(GPIO_C_VIRT,GPIO_STAT);

	irq = IRQ_CHAINED_GPIOC(0);

	IRQDBG("%s mask: 0x%08x irq: %d\n",__FUNCTION__,mask,irq);

	IRQDBG("%s mask: 0x%08x irq: %d\n", __func__, mask,irq);

	h720x_gpio_handler(mask, irq, desc);

}
@@ -155,7 +155,7 @@ h720x_gpiod_demux_handler(unsigned int irq_unused, struct irq_desc *desc) 


	mask = CPU_REG(GPIO_D_VIRT,GPIO_STAT);

	irq = IRQ_CHAINED_GPIOD(0);

	IRQDBG("%s mask: 0x%08x irq: %d\n",__FUNCTION__,mask,irq);

	IRQDBG("%s mask: 0x%08x irq: %d\n", __func__, mask,irq);

	h720x_gpio_handler(mask, irq, desc);

}
@@ -167,7 +167,7 @@ h720x_gpioe_demux_handler(unsigned int irq_unused, struct irq_desc *desc) 


	mask = CPU_REG(GPIO_E_VIRT,GPIO_STAT);

	irq = IRQ_CHAINED_GPIOE(0);

	IRQDBG("%s mask: 0x%08x irq: %d\n",__FUNCTION__,mask,irq);

	IRQDBG("%s mask: 0x%08x irq: %d\n", __func__, mask,irq);

	h720x_gpio_handler(mask, irq, desc);

}

#endif

arch/arm/mach-imx/dma.c

+6 −6
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline int imx_dma_sg_next(imx_dmach_t dma_ch, unsigned int lastcount) 


	if (!imxdma->name) {

		printk(KERN_CRIT "%s: called for  not allocated channel %d\n",

		       __FUNCTION__, dma_ch);

		       __func__, dma_ch);

		return 0;

	}
@@ -288,7 +288,7 @@ imx_dma_setup_handlers(imx_dmach_t dma_ch, 


	if (!imxdma->name) {

		printk(KERN_CRIT "%s: called for  not allocated channel %d\n",

		       __FUNCTION__, dma_ch);

		       __func__, dma_ch);

		return -ENODEV;

	}
@@ -321,7 +321,7 @@ void imx_dma_enable(imx_dmach_t dma_ch) 


	if (!imxdma->name) {

		printk(KERN_CRIT "%s: called for  not allocated channel %d\n",

		       __FUNCTION__, dma_ch);

		       __func__, dma_ch);

		return;

	}
@@ -365,7 +365,7 @@ int imx_dma_request(imx_dmach_t dma_ch, const char *name) 


	if (dma_ch >= IMX_DMA_CHANNELS) {

		printk(KERN_CRIT "%s: called for  non-existed channel %d\n",

		       __FUNCTION__, dma_ch);

		       __func__, dma_ch);

		return -EINVAL;

	}
@@ -396,7 +396,7 @@ void imx_dma_free(imx_dmach_t dma_ch) 
	if (!imxdma->name) {

		printk(KERN_CRIT

		       "%s: trying to free channel %d which is already freed\n",

		       __FUNCTION__, dma_ch);

		       __func__, dma_ch);

		return;

	}
@@ -456,7 +456,7 @@ imx_dma_request_by_prio(imx_dmach_t * pdma_ch, const char *name, 
		}

	}



	printk(KERN_ERR "%s: no free DMA channel found\n", __FUNCTION__);

	printk(KERN_ERR "%s: no free DMA channel found\n", __func__);



	return -ENODEV;

}

arch/arm/mach-imx/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -160,21 +160,21 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type) 
static void

imx_gpio_ack_irq(unsigned int irq)

{

	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, irq);

	DEBUG_IRQ("%s: irq %d\n", __func__, irq);

	ISR(IRQ_TO_REG(irq)) = 1 << ((irq - IRQ_GPIOA(0)) % 32);

}



static void

imx_gpio_mask_irq(unsigned int irq)

{

	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, irq);

	DEBUG_IRQ("%s: irq %d\n", __func__, irq);

	IMR(IRQ_TO_REG(irq)) &= ~( 1 << ((irq - IRQ_GPIOA(0)) % 32));

}



static void

imx_gpio_unmask_irq(unsigned int irq)

{

	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, irq);

	DEBUG_IRQ("%s: irq %d\n", __func__, irq);

	IMR(IRQ_TO_REG(irq)) |= 1 << ((irq - IRQ_GPIOA(0)) % 32);

}

arch/arm/mach-iop13xx/iq81340mc.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void __init iq81340mc_init(void) 
static void __init iq81340mc_timer_init(void)

{

	unsigned long bus_freq = iop13xx_core_freq() / iop13xx_xsi_bus_ratio();

	printk(KERN_DEBUG "%s: bus frequency: %lu\n", __FUNCTION__, bus_freq);

	printk(KERN_DEBUG "%s: bus frequency: %lu\n", __func__, bus_freq);

	iop_init_time(bus_freq);

}