diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-04 18:08:02 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-03-06 07:18:18 -0500 |
commit | 8e86f4271aaac7685923b80cf57972be41afbc1d (patch) | |
tree | 4817fbfdd60d4cccf6b87876765ce64f044d624a /arch/arm/mach-sa1100/dma.c | |
parent | 92df78519d0a6a8677cb827b5a1b7d2520d7e202 (diff) |
[ARM] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/dma.c')
-rw-r--r-- | arch/arm/mach-sa1100/dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c index 1fbe053e8b59..e5080286060e 100644 --- a/arch/arm/mach-sa1100/dma.c +++ b/arch/arm/mach-sa1100/dma.c | |||
@@ -129,7 +129,7 @@ int sa1100_request_dma (dma_device_t device, const char *device_id, | |||
129 | if (err) { | 129 | if (err) { |
130 | printk(KERN_ERR | 130 | printk(KERN_ERR |
131 | "%s: unable to request IRQ %d for %s\n", | 131 | "%s: unable to request IRQ %d for %s\n", |
132 | __FUNCTION__, IRQ_DMA0 + i, device_id); | 132 | __func__, IRQ_DMA0 + i, device_id); |
133 | dma->device = 0; | 133 | dma->device = 0; |
134 | return err; | 134 | return err; |
135 | } | 135 | } |
@@ -165,12 +165,12 @@ void sa1100_free_dma(dma_regs_t *regs) | |||
165 | if (regs == (dma_regs_t *)&DDAR(i)) | 165 | if (regs == (dma_regs_t *)&DDAR(i)) |
166 | break; | 166 | break; |
167 | if (i >= SA1100_DMA_CHANNELS) { | 167 | if (i >= SA1100_DMA_CHANNELS) { |
168 | printk(KERN_ERR "%s: bad DMA identifier\n", __FUNCTION__); | 168 | printk(KERN_ERR "%s: bad DMA identifier\n", __func__); |
169 | return; | 169 | return; |
170 | } | 170 | } |
171 | 171 | ||
172 | if (!dma_chan[i].device) { | 172 | if (!dma_chan[i].device) { |
173 | printk(KERN_ERR "%s: Trying to free free DMA\n", __FUNCTION__); | 173 | printk(KERN_ERR "%s: Trying to free free DMA\n", __func__); |
174 | return; | 174 | return; |
175 | } | 175 | } |
176 | 176 | ||
@@ -329,7 +329,7 @@ void sa1100_reset_dma(dma_regs_t *regs) | |||
329 | if (regs == (dma_regs_t *)&DDAR(i)) | 329 | if (regs == (dma_regs_t *)&DDAR(i)) |
330 | break; | 330 | break; |
331 | if (i >= SA1100_DMA_CHANNELS) { | 331 | if (i >= SA1100_DMA_CHANNELS) { |
332 | printk(KERN_ERR "%s: bad DMA identifier\n", __FUNCTION__); | 332 | printk(KERN_ERR "%s: bad DMA identifier\n", __func__); |
333 | return; | 333 | return; |
334 | } | 334 | } |
335 | 335 | ||