Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2e11cb4c52ffbadab4844b28803577ba7272b221

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent 23d077e281
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

pcmcia: replace remaining __FUNCTION__ occurrences 

__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>

Showing 14 changed files with 35 additions and 35 deletions Side-by-side Diff

drivers/pcmcia/au1000_db1x00.c
Diff comments   View file @ 2e11cb4
... ... @@ -194,7 +194,7 @@
194 194 default:
195 195 pwr |= SET_VCC_VPP(0,0,sock);
196 196 printk("%s: bad Vcc/Vpp (%d:%d)\n",
197   - __FUNCTION__,
  197 + __func__,
198 198 state->Vcc,
199 199 state->Vpp);
200 200 break;
... ... @@ -215,7 +215,7 @@
215 215 default:
216 216 pwr |= SET_VCC_VPP(0,0,sock);
217 217 printk("%s: bad Vcc/Vpp (%d:%d)\n",
218   - __FUNCTION__,
  218 + __func__,
219 219 state->Vcc,
220 220 state->Vpp);
221 221 break;
... ... @@ -224,7 +224,7 @@
224 224 default: /* what's this ? */
225 225 pwr |= SET_VCC_VPP(0,0,sock);
226 226 printk(KERN_ERR "%s: bad Vcc %d\n",
227   - __FUNCTION__, state->Vcc);
  227 + __func__, state->Vcc);
228 228 break;
229 229 }
230 230  
drivers/pcmcia/au1000_pb1x00.c
Diff comments   View file @ 2e11cb4
... ... @@ -244,7 +244,7 @@
244 244 pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
245 245 configure->sock);
246 246 printk("%s: bad Vcc/Vpp (%d:%d)\n",
247   - __FUNCTION__,
  247 + __func__,
248 248 configure->vcc,
249 249 configure->vpp);
250 250 break;
... ... @@ -272,7 +272,7 @@
272 272 pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
273 273 configure->sock);
274 274 printk("%s: bad Vcc/Vpp (%d:%d)\n",
275   - __FUNCTION__,
  275 + __func__,
276 276 configure->vcc,
277 277 configure->vpp);
278 278 break;
... ... @@ -300,7 +300,7 @@
300 300 pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,
301 301 configure->sock);
302 302 printk("%s: bad Vcc/Vpp (%d:%d)\n",
303   - __FUNCTION__,
  303 + __func__,
304 304 configure->vcc,
305 305 configure->vpp);
306 306 break;
... ... @@ -309,7 +309,7 @@
309 309 default: /* what's this ? */
310 310 pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,configure->sock);
311 311 printk(KERN_ERR "%s: bad Vcc %d\n",
312   - __FUNCTION__, configure->vcc);
  312 + __func__, configure->vcc);
313 313 break;
314 314 }
315 315  
... ... @@ -353,7 +353,7 @@
353 353 default:
354 354 pcr |= SET_VCC_VPP(0,0);
355 355 printk("%s: bad Vcc/Vpp (%d:%d)\n",
356   - __FUNCTION__,
  356 + __func__,
357 357 configure->vcc,
358 358 configure->vpp);
359 359 break;
... ... @@ -374,7 +374,7 @@
374 374 default:
375 375 pcr |= SET_VCC_VPP(0,0);
376 376 printk("%s: bad Vcc/Vpp (%d:%d)\n",
377   - __FUNCTION__,
  377 + __func__,
378 378 configure->vcc,
379 379 configure->vpp);
380 380 break;
... ... @@ -383,7 +383,7 @@
383 383 default: /* what's this ? */
384 384 pcr |= SET_VCC_VPP(0,0);
385 385 printk(KERN_ERR "%s: bad Vcc %d\n",
386   - __FUNCTION__, configure->vcc);
  386 + __func__, configure->vcc);
387 387 break;
388 388 }
389 389  
drivers/pcmcia/au1000_xxs1500.c
Diff comments   View file @ 2e11cb4
... ... @@ -56,7 +56,7 @@
56 56 #define PCMCIA_IRQ AU1000_GPIO_4
57 57  
58 58 #if 0
59   -#define DEBUG(x,args...) printk(__FUNCTION__ ": " x,##args)
  59 +#define DEBUG(x, args...) printk(__func__ ": " x, ##args)
60 60 #else
61 61 #define DEBUG(x,args...)
62 62 #endif
drivers/pcmcia/omap_cf.c
Diff comments   View file @ 2e11cb4
... ... @@ -153,7 +153,7 @@
153 153  
154 154 static int omap_cf_ss_suspend(struct pcmcia_socket *s)
155 155 {
156   - pr_debug("%s: %s\n", driver_name, __FUNCTION__);
  156 + pr_debug("%s: %s\n", driver_name, __func__);
157 157 return omap_cf_set_socket(s, &dead_socket);
158 158 }
159 159  
drivers/pcmcia/pxa2xx_lubbock.c
Diff comments   View file @ 2e11cb4
... ... @@ -87,7 +87,7 @@
87 87  
88 88 default:
89 89 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
90   - __FUNCTION__, state->Vcc);
  90 + __func__, state->Vcc);
91 91 ret = -1;
92 92 }
93 93  
... ... @@ -104,7 +104,7 @@
104 104 pa_dwr_set |= GPIO_A0;
105 105 else {
106 106 printk(KERN_ERR "%s(): unrecognized Vpp %u\n",
107   - __FUNCTION__, state->Vpp);
  107 + __func__, state->Vpp);
108 108 ret = -1;
109 109 break;
110 110 }
111 111  
... ... @@ -128,14 +128,14 @@
128 128  
129 129 default:
130 130 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
131   - __FUNCTION__, state->Vcc);
  131 + __func__, state->Vcc);
132 132 ret = -1;
133 133 break;
134 134 }
135 135  
136 136 if (state->Vpp != state->Vcc && state->Vpp != 0) {
137 137 printk(KERN_ERR "%s(): CF slot cannot support Vpp %u\n",
138   - __FUNCTION__, state->Vpp);
  138 + __func__, state->Vpp);
139 139 ret = -1;
140 140 break;
141 141 }
drivers/pcmcia/pxa2xx_mainstone.c
Diff comments   View file @ 2e11cb4
... ... @@ -99,7 +99,7 @@
99 99 case 50: power |= MST_PCMCIA_PWR_VCC_50; break;
100 100 default:
101 101 printk(KERN_ERR "%s(): bad Vcc %u\n",
102   - __FUNCTION__, state->Vcc);
  102 + __func__, state->Vcc);
103 103 ret = -1;
104 104 }
105 105  
... ... @@ -111,7 +111,7 @@
111 111 power |= MST_PCMCIA_PWR_VPP_VCC;
112 112 } else {
113 113 printk(KERN_ERR "%s(): bad Vpp %u\n",
114   - __FUNCTION__, state->Vpp);
  114 + __func__, state->Vpp);
115 115 ret = -1;
116 116 }
117 117 }
drivers/pcmcia/sa1100_assabet.c
Diff comments   View file @ 2e11cb4
... ... @@ -66,14 +66,14 @@
66 66  
67 67 case 50:
68 68 printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V...\n",
69   - __FUNCTION__);
  69 + __func__);
70 70  
71 71 case 33: /* Can only apply 3.3V to the CF slot. */
72 72 mask = ASSABET_BCR_CF_PWR;
73 73 break;
74 74  
75 75 default:
76   - printk(KERN_ERR "%s(): unrecognized Vcc %u\n", __FUNCTION__,
  76 + printk(KERN_ERR "%s(): unrecognized Vcc %u\n", __func__,
77 77 state->Vcc);
78 78 return -1;
79 79 }
drivers/pcmcia/sa1100_badge4.c
Diff comments   View file @ 2e11cb4
... ... @@ -82,14 +82,14 @@
82 82 case 0:
83 83 if ((state->Vcc != 0) &&
84 84 (state->Vcc != badge4_pcmvcc)) {
85   - complain_about_jumpering(__FUNCTION__, "pcmvcc",
  85 + complain_about_jumpering(__func__, "pcmvcc",
86 86 badge4_pcmvcc, state->Vcc);
87 87 // Apply power regardless of the jumpering.
88 88 // return -1;
89 89 }
90 90 if ((state->Vpp != 0) &&
91 91 (state->Vpp != badge4_pcmvpp)) {
92   - complain_about_jumpering(__FUNCTION__, "pcmvpp",
  92 + complain_about_jumpering(__func__, "pcmvpp",
93 93 badge4_pcmvpp, state->Vpp);
94 94 return -1;
95 95 }
... ... @@ -98,7 +98,7 @@
98 98 case 1:
99 99 if ((state->Vcc != 0) &&
100 100 (state->Vcc != badge4_cfvcc)) {
101   - complain_about_jumpering(__FUNCTION__, "cfvcc",
  101 + complain_about_jumpering(__func__, "cfvcc",
102 102 badge4_cfvcc, state->Vcc);
103 103 return -1;
104 104 }
... ... @@ -143,7 +143,7 @@
143 143 if (machine_is_badge4()) {
144 144 printk(KERN_INFO
145 145 "%s: badge4_pcmvcc=%d, badge4_pcmvpp=%d, badge4_cfvcc=%d\n",
146   - __FUNCTION__,
  146 + __func__,
147 147 badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc);
148 148  
149 149 ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2);
drivers/pcmcia/sa1100_cerf.c
Diff comments   View file @ 2e11cb4
... ... @@ -63,7 +63,7 @@
63 63  
64 64 default:
65 65 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
66   - __FUNCTION__, state->Vcc);
  66 + __func__, state->Vcc);
67 67 return -1;
68 68 }
69 69  
drivers/pcmcia/sa1100_jornada720.c
Diff comments   View file @ 2e11cb4
... ... @@ -42,7 +42,7 @@
42 42 unsigned int pa_dwr_mask, pa_dwr_set;
43 43 int ret;
44 44  
45   -printk("%s(): config socket %d vcc %d vpp %d\n", __FUNCTION__,
  45 +printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
46 46 skt->nr, state->Vcc, state->Vpp);
47 47  
48 48 switch (skt->nr) {
... ... @@ -74,7 +74,7 @@
74 74  
75 75 if (state->Vpp != state->Vcc && state->Vpp != 0) {
76 76 printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
77   - __FUNCTION__, state->Vpp);
  77 + __func__, state->Vpp);
78 78 return -1;
79 79 }
80 80  
drivers/pcmcia/sa1100_neponset.c
Diff comments   View file @ 2e11cb4
... ... @@ -59,7 +59,7 @@
59 59 ncr_set = NCR_A0VPP;
60 60 else {
61 61 printk(KERN_ERR "%s(): unrecognized VPP %u\n",
62   - __FUNCTION__, state->Vpp);
  62 + __func__, state->Vpp);
63 63 return -1;
64 64 }
65 65 break;
... ... @@ -71,7 +71,7 @@
71 71  
72 72 if (state->Vpp != state->Vcc && state->Vpp != 0) {
73 73 printk(KERN_ERR "%s(): CF slot cannot support VPP %u\n",
74   - __FUNCTION__, state->Vpp);
  74 + __func__, state->Vpp);
75 75 return -1;
76 76 }
77 77 break;
drivers/pcmcia/sa1100_shannon.c
Diff comments   View file @ 2e11cb4
... ... @@ -73,19 +73,19 @@
73 73 {
74 74 switch (state->Vcc) {
75 75 case 0: /* power off */
76   - printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __FUNCTION__);
  76 + printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __func__);
77 77 break;
78 78 case 50:
79   - printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
  79 + printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __func__);
80 80 case 33:
81 81 break;
82 82 default:
83 83 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
84   - __FUNCTION__, state->Vcc);
  84 + __func__, state->Vcc);
85 85 return -1;
86 86 }
87 87  
88   - printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __FUNCTION__);
  88 + printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __func__);
89 89  
90 90 /* Silently ignore Vpp, output enable, speaker enable. */
91 91  
drivers/pcmcia/sa1100_simpad.c
Diff comments   View file @ 2e11cb4
... ... @@ -90,7 +90,7 @@
90 90  
91 91 default:
92 92 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
93   - __FUNCTION__, state->Vcc);
  93 + __func__, state->Vcc);
94 94 clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
95 95 local_irq_restore(flags);
96 96 return -1;
drivers/pcmcia/soc_common.c
Diff comments   View file @ 2e11cb4
... ... @@ -354,7 +354,7 @@
354 354 (map->flags&MAP_PREFETCH)?"PREFETCH ":"");
355 355  
356 356 if (map->map >= MAX_IO_WIN) {
357   - printk(KERN_ERR "%s(): map (%d) out of range\n", __FUNCTION__,
  357 + printk(KERN_ERR "%s(): map (%d) out of range\n", __func__,
358 358 map->map);
359 359 return -1;
360 360 }