Commit 2e11cb4c authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

pcmcia: 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 avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 23d077e2

drivers/pcmcia/au1000_db1x00.c

+3 −3
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ db1x00_pcmcia_configure_socket(struct au1000_pcmcia_socket *skt, struct socket_s 
				default:

					pwr |= SET_VCC_VPP(0,0,sock);

					printk("%s: bad Vcc/Vpp (%d:%d)\n",

							__FUNCTION__,

							__func__,

							state->Vcc,

							state->Vpp);

					break;
@@ -215,7 +215,7 @@ db1x00_pcmcia_configure_socket(struct au1000_pcmcia_socket *skt, struct socket_s 
				default:

					pwr |= SET_VCC_VPP(0,0,sock);

					printk("%s: bad Vcc/Vpp (%d:%d)\n",

							__FUNCTION__,

							__func__,

							state->Vcc,

							state->Vpp);

					break;
@@ -224,7 +224,7 @@ db1x00_pcmcia_configure_socket(struct au1000_pcmcia_socket *skt, struct socket_s 
		default: /* what's this ? */

			pwr |= SET_VCC_VPP(0,0,sock);

			printk(KERN_ERR "%s: bad Vcc %d\n",

					__FUNCTION__, state->Vcc);

					__func__, state->Vcc);

			break;

	}

drivers/pcmcia/au1000_pb1x00.c

+7 −7
Original line number Diff line number Diff line
@@ -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;

	}

drivers/pcmcia/au1000_xxs1500.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#define PCMCIA_IRQ		AU1000_GPIO_4



#if 0

#define DEBUG(x,args...)	printk(__FUNCTION__ ": " x,##args)

#define DEBUG(x, args...)	printk(__func__ ": " x, ##args)

#else

#define DEBUG(x,args...)

#endif

drivers/pcmcia/omap_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ omap_cf_set_socket(struct pcmcia_socket *sock, struct socket_state_t *s) 


static int omap_cf_ss_suspend(struct pcmcia_socket *s)

{

	pr_debug("%s: %s\n", driver_name, __FUNCTION__);

	pr_debug("%s: %s\n", driver_name, __func__);

	return omap_cf_set_socket(s, &dead_socket);

}

drivers/pcmcia/pxa2xx_lubbock.c

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 


		default:

			printk(KERN_ERR "%s(): unrecognized Vcc %u\n",

			       __FUNCTION__, state->Vcc);

			       __func__, state->Vcc);

			ret = -1;

		}
@@ -104,7 +104,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
				pa_dwr_set |= GPIO_A0;

			else {

				printk(KERN_ERR "%s(): unrecognized Vpp %u\n",

				       __FUNCTION__, state->Vpp);

				       __func__, state->Vpp);

				ret = -1;

				break;

			}
@@ -128,14 +128,14 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 


		default:

			printk(KERN_ERR "%s(): unrecognized Vcc %u\n",

			       __FUNCTION__, state->Vcc);

			       __func__, state->Vcc);

			ret = -1;

			break;

		}



		if (state->Vpp != state->Vcc && state->Vpp != 0) {

			printk(KERN_ERR "%s(): CF slot cannot support Vpp %u\n",

			       __FUNCTION__, state->Vpp);

			       __func__, state->Vpp);

			ret = -1;

			break;

		}