Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2a4e2b8780c6df42b19c053243dada7fa4d311ee

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent dca03a5154
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

rtc: replace remaining __FUNCTION__ occurrences 

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 13 changed files with 60 additions and 60 deletions Side-by-side Diff

drivers/rtc/rtc-at91rm9200.c
Diff comments   View file @ 2a4e2b8
... ... @@ -83,7 +83,7 @@
83 83 tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);
84 84 tm->tm_year = tm->tm_year - 1900;
85 85  
86   - pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
  86 + pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
87 87 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
88 88 tm->tm_hour, tm->tm_min, tm->tm_sec);
89 89  
... ... @@ -97,7 +97,7 @@
97 97 {
98 98 unsigned long cr;
99 99  
100   - pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
  100 + pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
101 101 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
102 102 tm->tm_hour, tm->tm_min, tm->tm_sec);
103 103  
... ... @@ -142,7 +142,7 @@
142 142 alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)
143 143 ? 1 : 0;
144 144  
145   - pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
  145 + pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
146 146 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
147 147 tm->tm_hour, tm->tm_min, tm->tm_sec);
148 148  
... ... @@ -178,7 +178,7 @@
178 178 if (alrm->enabled)
179 179 at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);
180 180  
181   - pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
  181 + pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
182 182 at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour,
183 183 tm.tm_min, tm.tm_sec);
184 184  
... ... @@ -193,7 +193,7 @@
193 193 {
194 194 int ret = 0;
195 195  
196   - pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __FUNCTION__, cmd, arg);
  196 + pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __func__, cmd, arg);
197 197  
198 198 switch (cmd) {
199 199 case RTC_AIE_OFF: /* alarm off */
... ... @@ -265,7 +265,7 @@
265 265  
266 266 rtc_update_irq(rtc, 1, events);
267 267  
268   - pr_debug("%s(): num=%ld, events=0x%02lx\n", __FUNCTION__,
  268 + pr_debug("%s(): num=%ld, events=0x%02lx\n", __func__,
269 269 events >> 8, events & 0x000000FF);
270 270  
271 271 return IRQ_HANDLED;
drivers/rtc/rtc-at91sam9.c
Diff comments   View file @ 2a4e2b8
... ... @@ -288,7 +288,7 @@
288 288  
289 289 rtc_update_irq(rtc->rtcdev, 1, events);
290 290  
291   - pr_debug("%s: num=%ld, events=0x%02lx\n", __FUNCTION__,
  291 + pr_debug("%s: num=%ld, events=0x%02lx\n", __func__,
292 292 events >> 8, events & 0x000000FF);
293 293  
294 294 return IRQ_HANDLED;
drivers/rtc/rtc-ds1302.c
Diff comments   View file @ 2a4e2b8
... ... @@ -122,7 +122,7 @@
122 122  
123 123 dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
124 124 "mday=%d, mon=%d, year=%d, wday=%d\n",
125   - __FUNCTION__,
  125 + __func__,
126 126 tm->tm_sec, tm->tm_min, tm->tm_hour,
127 127 tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday);
128 128  
drivers/rtc/rtc-ds1672.c
Diff comments   View file @ 2a4e2b8
... ... @@ -50,13 +50,13 @@
50 50  
51 51 /* read date registers */
52 52 if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
53   - dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
  53 + dev_err(&client->dev, "%s: read error\n", __func__);
54 54 return -EIO;
55 55 }
56 56  
57 57 dev_dbg(&client->dev,
58 58 "%s: raw read data - counters=%02x,%02x,%02x,%02x\n",
59   - __FUNCTION__, buf[0], buf[1], buf[2], buf[3]);
  59 + __func__, buf[0], buf[1], buf[2], buf[3]);
60 60  
61 61 time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
62 62  
... ... @@ -64,7 +64,7 @@
64 64  
65 65 dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
66 66 "mday=%d, mon=%d, year=%d, wday=%d\n",
67   - __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,
  67 + __func__, tm->tm_sec, tm->tm_min, tm->tm_hour,
68 68 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
69 69  
70 70 return 0;
... ... @@ -84,7 +84,7 @@
84 84  
85 85 xfer = i2c_master_send(client, buf, 6);
86 86 if (xfer != 6) {
87   - dev_err(&client->dev, "%s: send: %d\n", __FUNCTION__, xfer);
  87 + dev_err(&client->dev, "%s: send: %d\n", __func__, xfer);
88 88 return -EIO;
89 89 }
90 90  
... ... @@ -98,7 +98,7 @@
98 98 dev_dbg(&client->dev,
99 99 "%s: secs=%d, mins=%d, hours=%d, "
100 100 "mday=%d, mon=%d, year=%d, wday=%d\n",
101   - __FUNCTION__,
  101 + __func__,
102 102 tm->tm_sec, tm->tm_min, tm->tm_hour,
103 103 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
104 104  
... ... @@ -133,7 +133,7 @@
133 133  
134 134 /* read control register */
135 135 if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
136   - dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
  136 + dev_err(&client->dev, "%s: read error\n", __func__);
137 137 return -EIO;
138 138 }
139 139  
... ... @@ -199,7 +199,7 @@
199 199 struct i2c_client *client;
200 200 struct rtc_device *rtc;
201 201  
202   - dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
  202 + dev_dbg(&adapter->dev, "%s\n", __func__);
203 203  
204 204 if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
205 205 err = -ENODEV;
drivers/rtc/rtc-max6900.c
Diff comments   View file @ 2a4e2b8
... ... @@ -98,7 +98,7 @@
98 98 rc = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
99 99 if (rc != ARRAY_SIZE(msgs)) {
100 100 dev_err(&client->dev, "%s: register read failed\n",
101   - __FUNCTION__);
  101 + __func__);
102 102 return -EIO;
103 103 }
104 104 return 0;
... ... @@ -150,7 +150,7 @@
150 150  
151 151 write_failed:
152 152 dev_err(&client->dev, "%s: register write failed\n",
153   - __FUNCTION__);
  153 + __func__);
154 154 return -EIO;
155 155 }
156 156  
... ... @@ -214,7 +214,7 @@
214 214 rc = i2c_smbus_write_byte_data (client, MAX6900_REG_CONTROL_WRITE, 0);
215 215 if (rc < 0) {
216 216 dev_err(&client->dev, "%s: control register write failed\n",
217   - __FUNCTION__);
  217 + __func__);
218 218 return -EIO;
219 219 }
220 220 return 0;
drivers/rtc/rtc-max6902.c
Diff comments   View file @ 2a4e2b8
... ... @@ -140,7 +140,7 @@
140 140 dt->tm_year -= 1900;
141 141  
142 142 #ifdef MAX6902_DEBUG
143   - printk("\n%s : Read RTC values\n",__FUNCTION__);
  143 + printk("\n%s : Read RTC values\n",__func__);
144 144 printk("tm_hour: %i\n",dt->tm_hour);
145 145 printk("tm_min : %i\n",dt->tm_min);
146 146 printk("tm_sec : %i\n",dt->tm_sec);
... ... @@ -158,7 +158,7 @@
158 158 dt->tm_year = dt->tm_year+1900;
159 159  
160 160 #ifdef MAX6902_DEBUG
161   - printk("\n%s : Setting RTC values\n",__FUNCTION__);
  161 + printk("\n%s : Setting RTC values\n",__func__);
162 162 printk("tm_sec : %i\n",dt->tm_sec);
163 163 printk("tm_min : %i\n",dt->tm_min);
164 164 printk("tm_hour: %i\n",dt->tm_hour);
drivers/rtc/rtc-pcf8563.c
Diff comments   View file @ 2a4e2b8
... ... @@ -80,7 +80,7 @@
80 80  
81 81 /* read registers */
82 82 if ((i2c_transfer(client->adapter, msgs, 2)) != 2) {
83   - dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
  83 + dev_err(&client->dev, "%s: read error\n", __func__);
84 84 return -EIO;
85 85 }
86 86  
... ... @@ -91,7 +91,7 @@
91 91 dev_dbg(&client->dev,
92 92 "%s: raw data is st1=%02x, st2=%02x, sec=%02x, min=%02x, hr=%02x, "
93 93 "mday=%02x, wday=%02x, mon=%02x, year=%02x\n",
94   - __FUNCTION__,
  94 + __func__,
95 95 buf[0], buf[1], buf[2], buf[3],
96 96 buf[4], buf[5], buf[6], buf[7],
97 97 buf[8]);
... ... @@ -112,7 +112,7 @@
112 112  
113 113 dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
114 114 "mday=%d, mon=%d, year=%d, wday=%d\n",
115   - __FUNCTION__,
  115 + __func__,
116 116 tm->tm_sec, tm->tm_min, tm->tm_hour,
117 117 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
118 118  
... ... @@ -133,7 +133,7 @@
133 133  
134 134 dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
135 135 "mday=%d, mon=%d, year=%d, wday=%d\n",
136   - __FUNCTION__,
  136 + __func__,
137 137 tm->tm_sec, tm->tm_min, tm->tm_hour,
138 138 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
139 139  
... ... @@ -163,7 +163,7 @@
163 163 if (err != sizeof(data)) {
164 164 dev_err(&client->dev,
165 165 "%s: err=%d addr=%02x, data=%02x\n",
166   - __FUNCTION__, err, data[0], data[1]);
  166 + __func__, err, data[0], data[1]);
167 167 return -EIO;
168 168 }
169 169 };
... ... @@ -208,7 +208,7 @@
208 208 if (xfer != ARRAY_SIZE(msgs)) {
209 209 dev_err(&client->dev,
210 210 "%s: could not read register 0x%02X\n",
211   - __FUNCTION__, pattern[i].reg);
  211 + __func__, pattern[i].reg);
212 212  
213 213 return -EIO;
214 214 }
... ... @@ -220,7 +220,7 @@
220 220 dev_dbg(&client->dev,
221 221 "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, "
222 222 "max=%d, value=%d, raw=0x%02X\n",
223   - __FUNCTION__, i, pattern[i].reg, pattern[i].mask,
  223 + __func__, i, pattern[i].reg, pattern[i].mask,
224 224 pattern[i].min, pattern[i].max,
225 225 value, buf);
226 226  
drivers/rtc/rtc-rs5c313.c
Diff comments   View file @ 2a4e2b8
... ... @@ -228,7 +228,7 @@
228 228 ndelay(700); /* CE:L */
229 229  
230 230 if (cnt++ > 100) {
231   - dev_err(dev, "%s: timeout error\n", __FUNCTION__);
  231 + dev_err(dev, "%s: timeout error\n", __func__);
232 232 return -EIO;
233 233 }
234 234 }
... ... @@ -289,7 +289,7 @@
289 289 ndelay(700); /* CE:L */
290 290  
291 291 if (cnt++ > 100) {
292   - dev_err(dev, "%s: timeout error\n", __FUNCTION__);
  292 + dev_err(dev, "%s: timeout error\n", __func__);
293 293 return -EIO;
294 294 }
295 295 }
drivers/rtc/rtc-rs5c372.c
Diff comments   View file @ 2a4e2b8
... ... @@ -166,7 +166,7 @@
166 166  
167 167 dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
168 168 "mday=%d, mon=%d, year=%d, wday=%d\n",
169   - __FUNCTION__,
  169 + __func__,
170 170 tm->tm_sec, tm->tm_min, tm->tm_hour,
171 171 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
172 172  
... ... @@ -181,7 +181,7 @@
181 181  
182 182 dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d "
183 183 "mday=%d, mon=%d, year=%d, wday=%d\n",
184   - __FUNCTION__,
  184 + __func__,
185 185 tm->tm_sec, tm->tm_min, tm->tm_hour,
186 186 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
187 187  
... ... @@ -195,7 +195,7 @@
195 195 buf[7] = BIN2BCD(tm->tm_year - 100);
196 196  
197 197 if ((i2c_master_send(client, buf, 8)) != 8) {
198   - dev_err(&client->dev, "%s: write error\n", __FUNCTION__);
  198 + dev_err(&client->dev, "%s: write error\n", __func__);
199 199 return -EIO;
200 200 }
201 201  
... ... @@ -220,7 +220,7 @@
220 220 *osc = (tmp & RS5C372_TRIM_XSL) ? 32000 : 32768;
221 221  
222 222 if (trim) {
223   - dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, tmp);
  223 + dev_dbg(&client->dev, "%s: raw trim=%x\n", __func__, tmp);
224 224 tmp &= RS5C372_TRIM_MASK;
225 225 if (tmp & 0x3e) {
226 226 int t = tmp & 0x3f;
... ... @@ -500,7 +500,7 @@
500 500 struct rs5c372 *rs5c372;
501 501 struct rtc_time tm;
502 502  
503   - dev_dbg(&client->dev, "%s\n", __FUNCTION__);
  503 + dev_dbg(&client->dev, "%s\n", __func__);
504 504  
505 505 if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
506 506 err = -ENODEV;
drivers/rtc/rtc-s3c.c
Diff comments   View file @ 2a4e2b8
... ... @@ -68,7 +68,7 @@
68 68 {
69 69 unsigned int tmp;
70 70  
71   - pr_debug("%s: aie=%d\n", __FUNCTION__, to);
  71 + pr_debug("%s: aie=%d\n", __func__, to);
72 72  
73 73 tmp = readb(s3c_rtc_base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN;
74 74  
... ... @@ -82,7 +82,7 @@
82 82 {
83 83 unsigned int tmp;
84 84  
85   - pr_debug("%s: pie=%d\n", __FUNCTION__, to);
  85 + pr_debug("%s: pie=%d\n", __func__, to);
86 86  
87 87 spin_lock_irq(&s3c_rtc_pie_lock);
88 88 tmp = readb(s3c_rtc_base + S3C2410_TICNT) & ~S3C2410_TICNT_ENABLE;
... ... @@ -457,7 +457,7 @@
457 457 struct resource *res;
458 458 int ret;
459 459  
460   - pr_debug("%s: probe=%p\n", __FUNCTION__, pdev);
  460 + pr_debug("%s: probe=%p\n", __func__, pdev);
461 461  
462 462 /* find the IRQs */
463 463  
drivers/rtc/rtc-sh.c
Diff comments   View file @ 2a4e2b8
... ... @@ -361,7 +361,7 @@
361 361  
362 362 dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
363 363 "mday=%d, mon=%d, year=%d, wday=%d\n",
364   - __FUNCTION__,
  364 + __func__,
365 365 tm->tm_sec, tm->tm_min, tm->tm_hour,
366 366 tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday);
367 367  
drivers/rtc/rtc-v3020.c
Diff comments   View file @ 2a4e2b8
... ... @@ -107,7 +107,7 @@
107 107 dt->tm_year = BCD2BIN(tmp)+100;
108 108  
109 109 #ifdef DEBUG
110   - printk("\n%s : Read RTC values\n",__FUNCTION__);
  110 + printk("\n%s : Read RTC values\n",__func__);
111 111 printk("tm_hour: %i\n",dt->tm_hour);
112 112 printk("tm_min : %i\n",dt->tm_min);
113 113 printk("tm_sec : %i\n",dt->tm_sec);
... ... @@ -126,7 +126,7 @@
126 126 struct v3020 *chip = dev_get_drvdata(dev);
127 127  
128 128 #ifdef DEBUG
129   - printk("\n%s : Setting RTC values\n",__FUNCTION__);
  129 + printk("\n%s : Setting RTC values\n",__func__);
130 130 printk("tm_sec : %i\n",dt->tm_sec);
131 131 printk("tm_min : %i\n",dt->tm_min);
132 132 printk("tm_hour: %i\n",dt->tm_hour);
drivers/rtc/rtc-x1205.c
Diff comments   View file @ 2a4e2b8
... ... @@ -99,14 +99,14 @@
99 99  
100 100 /* read date registers */
101 101 if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
102   - dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
  102 + dev_err(&client->dev, "%s: read error\n", __func__);
103 103 return -EIO;
104 104 }
105 105  
106 106 dev_dbg(&client->dev,
107 107 "%s: raw read data - sec=%02x, min=%02x, hr=%02x, "
108 108 "mday=%02x, mon=%02x, year=%02x, wday=%02x, y2k=%02x\n",
109   - __FUNCTION__,
  109 + __func__,
110 110 buf[0], buf[1], buf[2], buf[3],
111 111 buf[4], buf[5], buf[6], buf[7]);
112 112  
... ... @@ -121,7 +121,7 @@
121 121  
122 122 dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
123 123 "mday=%d, mon=%d, year=%d, wday=%d\n",
124   - __FUNCTION__,
  124 + __func__,
125 125 tm->tm_sec, tm->tm_min, tm->tm_hour,
126 126 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
127 127  
... ... @@ -139,7 +139,7 @@
139 139  
140 140 /* read status register */
141 141 if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
142   - dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
  142 + dev_err(&client->dev, "%s: read error\n", __func__);
143 143 return -EIO;
144 144 }
145 145  
... ... @@ -162,7 +162,7 @@
162 162  
163 163 dev_dbg(&client->dev,
164 164 "%s: secs=%d, mins=%d, hours=%d\n",
165   - __FUNCTION__,
  165 + __func__,
166 166 tm->tm_sec, tm->tm_min, tm->tm_hour);
167 167  
168 168 buf[CCR_SEC] = BIN2BCD(tm->tm_sec);
... ... @@ -175,7 +175,7 @@
175 175 if (datetoo) {
176 176 dev_dbg(&client->dev,
177 177 "%s: mday=%d, mon=%d, year=%d, wday=%d\n",
178   - __FUNCTION__,
  178 + __func__,
179 179 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
180 180  
181 181 buf[CCR_MDAY] = BIN2BCD(tm->tm_mday);
182 182  
... ... @@ -191,12 +191,12 @@
191 191  
192 192 /* this sequence is required to unlock the chip */
193 193 if ((xfer = i2c_master_send(client, wel, 3)) != 3) {
194   - dev_err(&client->dev, "%s: wel - %d\n", __FUNCTION__, xfer);
  194 + dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer);
195 195 return -EIO;
196 196 }
197 197  
198 198 if ((xfer = i2c_master_send(client, rwel, 3)) != 3) {
199   - dev_err(&client->dev, "%s: rwel - %d\n", __FUNCTION__, xfer);
  199 + dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer);
200 200 return -EIO;
201 201 }
202 202  
... ... @@ -208,7 +208,7 @@
208 208 if (xfer != 3) {
209 209 dev_err(&client->dev,
210 210 "%s: xfer=%d addr=%02x, data=%02x\n",
211   - __FUNCTION__,
  211 + __func__,
212 212 xfer, rdata[1], rdata[2]);
213 213 return -EIO;
214 214 }
... ... @@ -216,7 +216,7 @@
216 216  
217 217 /* disable further writes */
218 218 if ((xfer = i2c_master_send(client, diswe, 3)) != 3) {
219   - dev_err(&client->dev, "%s: diswe - %d\n", __FUNCTION__, xfer);
  219 + dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer);
220 220 return -EIO;
221 221 }
222 222  
223 223  
... ... @@ -249,11 +249,11 @@
249 249  
250 250 /* read dtr register */
251 251 if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
252   - dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
  252 + dev_err(&client->dev, "%s: read error\n", __func__);
253 253 return -EIO;
254 254 }
255 255  
256   - dev_dbg(&client->dev, "%s: raw dtr=%x\n", __FUNCTION__, dtr);
  256 + dev_dbg(&client->dev, "%s: raw dtr=%x\n", __func__, dtr);
257 257  
258 258 *trim = 0;
259 259  
260 260  
... ... @@ -281,11 +281,11 @@
281 281  
282 282 /* read atr register */
283 283 if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
284   - dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
  284 + dev_err(&client->dev, "%s: read error\n", __func__);
285 285 return -EIO;
286 286 }
287 287  
288   - dev_dbg(&client->dev, "%s: raw atr=%x\n", __FUNCTION__, atr);
  288 + dev_dbg(&client->dev, "%s: raw atr=%x\n", __func__, atr);
289 289  
290 290 /* atr is a two's complement value on 6 bits,
291 291 * perform sign extension. The formula is
292 292  
... ... @@ -294,11 +294,11 @@
294 294 if (atr & 0x20)
295 295 atr |= 0xC0;
296 296  
297   - dev_dbg(&client->dev, "%s: raw atr=%x (%d)\n", __FUNCTION__, atr, atr);
  297 + dev_dbg(&client->dev, "%s: raw atr=%x (%d)\n", __func__, atr, atr);
298 298  
299 299 *trim = (atr * 250) + 11000;
300 300  
301   - dev_dbg(&client->dev, "%s: real=%d\n", __FUNCTION__, *trim);
  301 + dev_dbg(&client->dev, "%s: real=%d\n", __func__, *trim);
302 302  
303 303 return 0;
304 304 }
... ... @@ -352,7 +352,7 @@
352 352 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
353 353 dev_err(&client->dev,
354 354 "%s: could not read register %x\n",
355   - __FUNCTION__, probe_zero_pattern[i]);
  355 + __func__, probe_zero_pattern[i]);
356 356  
357 357 return -EIO;
358 358 }
... ... @@ -360,7 +360,7 @@
360 360 if ((buf & probe_zero_pattern[i+1]) != 0) {
361 361 dev_err(&client->dev,
362 362 "%s: register=%02x, zero pattern=%d, value=%x\n",
363   - __FUNCTION__, probe_zero_pattern[i], i, buf);
  363 + __func__, probe_zero_pattern[i], i, buf);
364 364  
365 365 return -ENODEV;
366 366 }
... ... @@ -380,7 +380,7 @@
380 380 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
381 381 dev_err(&client->dev,
382 382 "%s: could not read register %x\n",
383   - __FUNCTION__, probe_limits_pattern[i].reg);
  383 + __func__, probe_limits_pattern[i].reg);
384 384  
385 385 return -EIO;
386 386 }
... ... @@ -391,7 +391,7 @@
391 391 value < probe_limits_pattern[i].min) {
392 392 dev_dbg(&client->dev,
393 393 "%s: register=%x, lim pattern=%d, value=%d\n",
394   - __FUNCTION__, probe_limits_pattern[i].reg,
  394 + __func__, probe_limits_pattern[i].reg,
395 395 i, value);
396 396  
397 397 return -ENODEV;