1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c
index 86c0808d6a05..157e41423a0a 100644
--- a/drivers/pcmcia/au1000_pb1x00.c
+++ b/drivers/pcmcia/au1000_pb1x00.c
@@ -244,7 +244,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
                                        pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
                                                        configure->sock);
                                        printk("%s: bad Vcc/Vpp (%d:%d)\n", 
-                                                        __FUNCTION__, 
+                                                        __func__,
                                                        configure->vcc, 
                                                        configure->vpp);
                                        break;
@@ -272,7 +272,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
                                        pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
                                                        configure->sock);
                                        printk("%s: bad Vcc/Vpp (%d:%d)\n", 
-                                                        __FUNCTION__, 
+                                                        __func__,
                                                        configure->vcc, 
                                                        configure->vpp);
                                        break;
@@ -300,7 +300,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
                                        pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
                                                        configure->sock);
                                        printk("%s: bad Vcc/Vpp (%d:%d)\n", 
-                                                        __FUNCTION__, 
+                                                        __func__,
                                                        configure->vcc, 
                                                        configure->vpp);
                                        break;
@@ -309,7 +309,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
                default: /* what's this ? */
                        pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,configure->sock);
                        printk(KERN_ERR "%s: bad Vcc %d\n", 
-                                        __FUNCTION__, configure->vcc);
+                                        __func__, configure->vcc);
                        break;
        }
@@ -353,7 +353,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
                                default:
                                        pcr |= SET_VCC_VPP(0,0);
                                        printk("%s: bad Vcc/Vpp (%d:%d)\n", 
-                                                        __FUNCTION__, 
+                                                        __func__,
                                                        configure->vcc, 
                                                        configure->vpp);
                                        break;
@@ -374,7 +374,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
                                default:
                                        pcr |= SET_VCC_VPP(0,0);
                                        printk("%s: bad Vcc/Vpp (%d:%d)\n", 
-                                                        __FUNCTION__, 
+                                                        __func__,
                                                        configure->vcc, 
                                                        configure->vpp);
                                        break;
@@ -383,7 +383,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
                default: /* what's this ? */
                        pcr |= SET_VCC_VPP(0,0);
                        printk(KERN_ERR "%s: bad Vcc %d\n", 
-                                        __FUNCTION__, configure->vcc);
+                                        __func__, configure->vcc);
                        break;
        }

diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c index 86c0808d6a05..157e41423a0a 100644 --- a/drivers/pcmcia/au1000_pb1x00.c +++ b/drivers/pcmcia/au1000_pb1x00.c
@@ -244,7 +244,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
244	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,	244	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
245	configure->sock);	245	configure->sock);
246	printk("%s: bad Vcc/Vpp (%d:%d)\n",	246	printk("%s: bad Vcc/Vpp (%d:%d)\n",
247	__FUNCTION__,	247	__func__,
248	configure->vcc,	248	configure->vcc,
249	configure->vpp);	249	configure->vpp);
250	break;	250	break;
@@ -272,7 +272,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
272	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,	272	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
273	configure->sock);	273	configure->sock);
274	printk("%s: bad Vcc/Vpp (%d:%d)\n",	274	printk("%s: bad Vcc/Vpp (%d:%d)\n",
275	__FUNCTION__,	275	__func__,
276	configure->vcc,	276	configure->vcc,
277	configure->vpp);	277	configure->vpp);
278	break;	278	break;
@@ -300,7 +300,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
300	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,	300	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
301	configure->sock);	301	configure->sock);
302	printk("%s: bad Vcc/Vpp (%d:%d)\n",	302	printk("%s: bad Vcc/Vpp (%d:%d)\n",
303	__FUNCTION__,	303	__func__,
304	configure->vcc,	304	configure->vcc,
305	configure->vpp);	305	configure->vpp);
306	break;	306	break;
@@ -309,7 +309,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
309	default: /* what's this ? */	309	default: /* what's this ? */
310	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,configure->sock);	310	pcr \|= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,configure->sock);
311	printk(KERN_ERR "%s: bad Vcc %d\n",	311	printk(KERN_ERR "%s: bad Vcc %d\n",
312	__FUNCTION__, configure->vcc);	312	__func__, configure->vcc);
313	break;	313	break;
314	}	314	}
315		315
@@ -353,7 +353,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
353	default:	353	default:
354	pcr \|= SET_VCC_VPP(0,0);	354	pcr \|= SET_VCC_VPP(0,0);
355	printk("%s: bad Vcc/Vpp (%d:%d)\n",	355	printk("%s: bad Vcc/Vpp (%d:%d)\n",
356	__FUNCTION__,	356	__func__,
357	configure->vcc,	357	configure->vcc,
358	configure->vpp);	358	configure->vpp);
359	break;	359	break;
@@ -374,7 +374,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
374	default:	374	default:
375	pcr \|= SET_VCC_VPP(0,0);	375	pcr \|= SET_VCC_VPP(0,0);
376	printk("%s: bad Vcc/Vpp (%d:%d)\n",	376	printk("%s: bad Vcc/Vpp (%d:%d)\n",
377	__FUNCTION__,	377	__func__,
378	configure->vcc,	378	configure->vcc,
379	configure->vpp);	379	configure->vpp);
380	break;	380	break;
@@ -383,7 +383,7 @@ pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)
383	default: /* what's this ? */	383	default: /* what's this ? */
384	pcr \|= SET_VCC_VPP(0,0);	384	pcr \|= SET_VCC_VPP(0,0);
385	printk(KERN_ERR "%s: bad Vcc %d\n",	385	printk(KERN_ERR "%s: bad Vcc %d\n",
386	__FUNCTION__, configure->vcc);	386	__func__, configure->vcc);
387	break;	387	break;
388	}	388	}
389		389