Skip to content

Commit

Permalink
pcmcia: replace remaining __FUNCTION__ occurrences
Browse files Browse the repository at this point in the history 
__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: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed May 1, 2008
1 parent 23d077e commit 2e11cb4
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions drivers/pcmcia/au1000_db1x00.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down
14 changes: 7 additions & 7 deletions drivers/pcmcia/au1000_pb1x00.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/pcmcia/au1000_xxs1500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/pcmcia/omap_cf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
8 changes: 4 additions & 4 deletions drivers/pcmcia/pxa2xx_lubbock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/pcmcia/pxa2xx_mainstone.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
case 50: power |= MST_PCMCIA_PWR_VCC_50; break;
default:
printk(KERN_ERR "%s(): bad Vcc %u\n",
__FUNCTION__, state->Vcc);
__func__, state->Vcc);
ret = -1;
}

Expand All @@ -111,7 +111,7 @@ static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
power |= MST_PCMCIA_PWR_VPP_VCC;
} else {
printk(KERN_ERR "%s(): bad Vpp %u\n",
__FUNCTION__, state->Vpp);
__func__, state->Vpp);
ret = -1;
}
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/pcmcia/sa1100_assabet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ assabet_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_stat

case 50:
printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V...\n",
__FUNCTION__);
__func__);

case 33: /* Can only apply 3.3V to the CF slot. */
mask = ASSABET_BCR_CF_PWR;
break;

default:
printk(KERN_ERR "%s(): unrecognized Vcc %u\n", __FUNCTION__,
printk(KERN_ERR "%s(): unrecognized Vcc %u\n", __func__,
state->Vcc);
return -1;
}
Expand Down
8 changes: 4 additions & 4 deletions drivers/pcmcia/sa1100_badge4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state
case 0:
if ((state->Vcc != 0) &&
(state->Vcc != badge4_pcmvcc)) {
complain_about_jumpering(__FUNCTION__, "pcmvcc",
complain_about_jumpering(__func__, "pcmvcc",
badge4_pcmvcc, state->Vcc);
// Apply power regardless of the jumpering.
// return -1;
}
if ((state->Vpp != 0) &&
(state->Vpp != badge4_pcmvpp)) {
complain_about_jumpering(__FUNCTION__, "pcmvpp",
complain_about_jumpering(__func__, "pcmvpp",
badge4_pcmvpp, state->Vpp);
return -1;
}
Expand All @@ -98,7 +98,7 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state
case 1:
if ((state->Vcc != 0) &&
(state->Vcc != badge4_cfvcc)) {
complain_about_jumpering(__FUNCTION__, "cfvcc",
complain_about_jumpering(__func__, "cfvcc",
badge4_cfvcc, state->Vcc);
return -1;
}
Expand Down Expand Up @@ -143,7 +143,7 @@ int pcmcia_badge4_init(struct device *dev)
if (machine_is_badge4()) {
printk(KERN_INFO
"%s: badge4_pcmvcc=%d, badge4_pcmvpp=%d, badge4_cfvcc=%d\n",
__FUNCTION__,
__func__,
badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc);

ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/pcmcia/sa1100_cerf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ cerf_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,

default:
printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
__FUNCTION__, state->Vcc);
__func__, state->Vcc);
return -1;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/pcmcia/sa1100_jornada720.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
unsigned int pa_dwr_mask, pa_dwr_set;
int ret;

printk("%s(): config socket %d vcc %d vpp %d\n", __FUNCTION__,
printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
skt->nr, state->Vcc, state->Vpp);

switch (skt->nr) {
Expand Down Expand Up @@ -74,7 +74,7 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __FUNCTION__,

if (state->Vpp != state->Vcc && state->Vpp != 0) {
printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
__FUNCTION__, state->Vpp);
__func__, state->Vpp);
return -1;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/pcmcia/sa1100_neponset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_sta
ncr_set = NCR_A0VPP;
else {
printk(KERN_ERR "%s(): unrecognized VPP %u\n",
__FUNCTION__, state->Vpp);
__func__, state->Vpp);
return -1;
}
break;
Expand All @@ -71,7 +71,7 @@ neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_sta

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);
return -1;
}
break;
Expand Down
8 changes: 4 additions & 4 deletions drivers/pcmcia/sa1100_shannon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@ shannon_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
{
switch (state->Vcc) {
case 0: /* power off */
printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __FUNCTION__);
printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __func__);
break;
case 50:
printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __func__);
case 33:
break;
default:
printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
__FUNCTION__, state->Vcc);
__func__, state->Vcc);
return -1;
}

printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __FUNCTION__);
printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __func__);

/* Silently ignore Vpp, output enable, speaker enable. */

Expand Down
2 changes: 1 addition & 1 deletion drivers/pcmcia/sa1100_simpad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ simpad_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,

default:
printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
__FUNCTION__, state->Vcc);
__func__, state->Vcc);
clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
local_irq_restore(flags);
return -1;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pcmcia/soc_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m
(map->flags&MAP_PREFETCH)?"PREFETCH ":"");

if (map->map >= MAX_IO_WIN) {
printk(KERN_ERR "%s(): map (%d) out of range\n", __FUNCTION__,
printk(KERN_ERR "%s(): map (%d) out of range\n", __func__,
map->map);
return -1;
}
Expand Down

0 comments on commit 2e11cb4

Please sign in to comment.