diff options
Diffstat (limited to 'drivers/pcmcia/sa1100_badge4.c')
-rw-r--r-- | drivers/pcmcia/sa1100_badge4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c index 62bfc7566ec2..607c3f326eca 100644 --- a/drivers/pcmcia/sa1100_badge4.c +++ b/drivers/pcmcia/sa1100_badge4.c | |||
@@ -82,14 +82,14 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state | |||
82 | case 0: | 82 | case 0: |
83 | if ((state->Vcc != 0) && | 83 | if ((state->Vcc != 0) && |
84 | (state->Vcc != badge4_pcmvcc)) { | 84 | (state->Vcc != badge4_pcmvcc)) { |
85 | complain_about_jumpering(__FUNCTION__, "pcmvcc", | 85 | complain_about_jumpering(__func__, "pcmvcc", |
86 | badge4_pcmvcc, state->Vcc); | 86 | badge4_pcmvcc, state->Vcc); |
87 | // Apply power regardless of the jumpering. | 87 | // Apply power regardless of the jumpering. |
88 | // return -1; | 88 | // return -1; |
89 | } | 89 | } |
90 | if ((state->Vpp != 0) && | 90 | if ((state->Vpp != 0) && |
91 | (state->Vpp != badge4_pcmvpp)) { | 91 | (state->Vpp != badge4_pcmvpp)) { |
92 | complain_about_jumpering(__FUNCTION__, "pcmvpp", | 92 | complain_about_jumpering(__func__, "pcmvpp", |
93 | badge4_pcmvpp, state->Vpp); | 93 | badge4_pcmvpp, state->Vpp); |
94 | return -1; | 94 | return -1; |
95 | } | 95 | } |
@@ -98,7 +98,7 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state | |||
98 | case 1: | 98 | case 1: |
99 | if ((state->Vcc != 0) && | 99 | if ((state->Vcc != 0) && |
100 | (state->Vcc != badge4_cfvcc)) { | 100 | (state->Vcc != badge4_cfvcc)) { |
101 | complain_about_jumpering(__FUNCTION__, "cfvcc", | 101 | complain_about_jumpering(__func__, "cfvcc", |
102 | badge4_cfvcc, state->Vcc); | 102 | badge4_cfvcc, state->Vcc); |
103 | return -1; | 103 | return -1; |
104 | } | 104 | } |
@@ -143,7 +143,7 @@ int pcmcia_badge4_init(struct device *dev) | |||
143 | if (machine_is_badge4()) { | 143 | if (machine_is_badge4()) { |
144 | printk(KERN_INFO | 144 | printk(KERN_INFO |
145 | "%s: badge4_pcmvcc=%d, badge4_pcmvpp=%d, badge4_cfvcc=%d\n", | 145 | "%s: badge4_pcmvcc=%d, badge4_pcmvpp=%d, badge4_cfvcc=%d\n", |
146 | __FUNCTION__, | 146 | __func__, |
147 | badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc); | 147 | badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc); |
148 | 148 | ||
149 | ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2); | 149 | ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2); |