diff options
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/cpu-sa1100.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/dma.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 14 |
4 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index f60b7a66dfa0..842d9e6dc5ff 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c | |||
@@ -206,7 +206,7 @@ static int __init badge4_init(void) | |||
206 | if (ret < 0) | 206 | if (ret < 0) |
207 | printk(KERN_ERR | 207 | printk(KERN_ERR |
208 | "%s: SA-1111 initialization failed (%d)\n", | 208 | "%s: SA-1111 initialization failed (%d)\n", |
209 | __FUNCTION__, ret); | 209 | __func__, ret); |
210 | 210 | ||
211 | 211 | ||
212 | /* maybe turn on 5v0 from the start */ | 212 | /* maybe turn on 5v0 from the start */ |
@@ -240,11 +240,11 @@ void badge4_set_5V(unsigned subsystem, int on) | |||
240 | /* detect on->off and off->on transitions */ | 240 | /* detect on->off and off->on transitions */ |
241 | if ((!old_5V_bitmap) && (badge4_5V_bitmap)) { | 241 | if ((!old_5V_bitmap) && (badge4_5V_bitmap)) { |
242 | /* was off, now on */ | 242 | /* was off, now on */ |
243 | printk(KERN_INFO "%s: enabling 5V supply rail\n", __FUNCTION__); | 243 | printk(KERN_INFO "%s: enabling 5V supply rail\n", __func__); |
244 | GPSR = BADGE4_GPIO_PCMEN5V; | 244 | GPSR = BADGE4_GPIO_PCMEN5V; |
245 | } else if ((old_5V_bitmap) && (!badge4_5V_bitmap)) { | 245 | } else if ((old_5V_bitmap) && (!badge4_5V_bitmap)) { |
246 | /* was on, now off */ | 246 | /* was on, now off */ |
247 | printk(KERN_INFO "%s: disabling 5V supply rail\n", __FUNCTION__); | 247 | printk(KERN_INFO "%s: disabling 5V supply rail\n", __func__); |
248 | GPCR = BADGE4_GPIO_PCMEN5V; | 248 | GPCR = BADGE4_GPIO_PCMEN5V; |
249 | } | 249 | } |
250 | 250 | ||
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c index d68630b74d78..343368aa82de 100644 --- a/arch/arm/mach-sa1100/cpu-sa1100.c +++ b/arch/arm/mach-sa1100/cpu-sa1100.c | |||
@@ -139,7 +139,7 @@ static void sa1100_update_dram_timings(int current_speed, int new_speed) | |||
139 | 139 | ||
140 | if (settings->speed == 0) { | 140 | if (settings->speed == 0) { |
141 | panic("%s: couldn't find dram setting for speed %d\n", | 141 | panic("%s: couldn't find dram setting for speed %d\n", |
142 | __FUNCTION__, new_speed); | 142 | __func__, new_speed); |
143 | } | 143 | } |
144 | 144 | ||
145 | /* No risk, no fun: run with interrupts on! */ | 145 | /* No risk, no fun: run with interrupts on! */ |
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 | ||
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index b72fee0f2538..8473c37b77d6 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -596,7 +596,7 @@ static void h3800_control_egpio(enum ipaq_egpio_type x, int setp) | |||
596 | case IPAQ_EGPIO_CODEC_NRESET: | 596 | case IPAQ_EGPIO_CODEC_NRESET: |
597 | case IPAQ_EGPIO_AUDIO_ON: | 597 | case IPAQ_EGPIO_AUDIO_ON: |
598 | case IPAQ_EGPIO_QMUTE: | 598 | case IPAQ_EGPIO_QMUTE: |
599 | printk("%s: error - should not be called\n", __FUNCTION__); | 599 | printk("%s: error - should not be called\n", __func__); |
600 | break; | 600 | break; |
601 | case IPAQ_EGPIO_OPT_NVRAM_ON: | 601 | case IPAQ_EGPIO_OPT_NVRAM_ON: |
602 | SET_ASIC2(GPIO2_OPT_ON_NVRAM); | 602 | SET_ASIC2(GPIO2_OPT_ON_NVRAM); |
@@ -638,7 +638,7 @@ static int h3800_pm_callback(int req) | |||
638 | static u16 asic2_data; | 638 | static u16 asic2_data; |
639 | int result = 0; | 639 | int result = 0; |
640 | 640 | ||
641 | printk("%s %d\n", __FUNCTION__, req); | 641 | printk("%s %d\n", __func__, req); |
642 | 642 | ||
643 | switch (req) { | 643 | switch (req) { |
644 | case PM_RESUME: | 644 | case PM_RESUME: |
@@ -666,7 +666,7 @@ static int h3800_pm_callback(int req) | |||
666 | asic2_data = H3800_ASIC2_GPIOPIOD; | 666 | asic2_data = H3800_ASIC2_GPIOPIOD; |
667 | break; | 667 | break; |
668 | default: | 668 | default: |
669 | printk("%s: unrecognized PM callback\n", __FUNCTION__); | 669 | printk("%s: unrecognized PM callback\n", __func__); |
670 | break; | 670 | break; |
671 | } | 671 | } |
672 | return result; | 672 | return result; |
@@ -706,7 +706,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irq_desc *desc) | |||
706 | { | 706 | { |
707 | int i; | 707 | int i; |
708 | 708 | ||
709 | if (0) printk("%s: interrupt received\n", __FUNCTION__); | 709 | if (0) printk("%s: interrupt received\n", __func__); |
710 | 710 | ||
711 | desc->chip->ack(irq); | 711 | desc->chip->ack(irq); |
712 | 712 | ||
@@ -716,21 +716,21 @@ static void h3800_IRQ_demux(unsigned int irq, struct irq_desc *desc) | |||
716 | 716 | ||
717 | /* KPIO */ | 717 | /* KPIO */ |
718 | irq = H3800_ASIC2_KPIINTFLAG; | 718 | irq = H3800_ASIC2_KPIINTFLAG; |
719 | if (0) printk("%s KPIO 0x%08X\n", __FUNCTION__, irq); | 719 | if (0) printk("%s KPIO 0x%08X\n", __func__, irq); |
720 | for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++) | 720 | for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++) |
721 | if (irq & kpio_irq_mask[j]) | 721 | if (irq & kpio_irq_mask[j]) |
722 | handle_edge_irq(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j); | 722 | handle_edge_irq(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j); |
723 | 723 | ||
724 | /* GPIO2 */ | 724 | /* GPIO2 */ |
725 | irq = H3800_ASIC2_GPIINTFLAG; | 725 | irq = H3800_ASIC2_GPIINTFLAG; |
726 | if (0) printk("%s GPIO 0x%08X\n", __FUNCTION__, irq); | 726 | if (0) printk("%s GPIO 0x%08X\n", __func__, irq); |
727 | for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++) | 727 | for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++) |
728 | if (irq & gpio_irq_mask[j]) | 728 | if (irq & gpio_irq_mask[j]) |
729 | handle_edge_irq(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j); | 729 | handle_edge_irq(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j); |
730 | } | 730 | } |
731 | 731 | ||
732 | if (i >= MAX_ASIC_ISR_LOOPS) | 732 | if (i >= MAX_ASIC_ISR_LOOPS) |
733 | printk("%s: interrupt processing overrun\n", __FUNCTION__); | 733 | printk("%s: interrupt processing overrun\n", __func__); |
734 | 734 | ||
735 | /* For level-based interrupts */ | 735 | /* For level-based interrupts */ |
736 | desc->chip->unmask(irq); | 736 | desc->chip->unmask(irq); |