diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-08-20 19:52:04 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:59:00 -0400 |
commit | b39d66a81fb4f5ab555f86a2e49f3714f8369a3d (patch) | |
tree | 20ffb096fe2781545ac3f77f07ebbb347234e111 /drivers/net/arcnet/com20020.c | |
parent | b514f6b6da3aedcf4eb6f0c69e910ae89ef4632f (diff) |
drivers/net: replace __FUNCTION__ with __func__
__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: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/arcnet/com20020.c')
-rw-r--r-- | drivers/net/arcnet/com20020.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index 8b51313b1300..70124a944e7d 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c | |||
@@ -238,15 +238,15 @@ static int com20020_reset(struct net_device *dev, int really_reset) | |||
238 | u_char inbyte; | 238 | u_char inbyte; |
239 | 239 | ||
240 | BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n", | 240 | BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n", |
241 | __FILE__,__LINE__,__FUNCTION__,dev,lp,dev->name); | 241 | __FILE__,__LINE__,__func__,dev,lp,dev->name); |
242 | BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", | 242 | BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", |
243 | dev->name, ASTATUS()); | 243 | dev->name, ASTATUS()); |
244 | 244 | ||
245 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 245 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
246 | lp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2); | 246 | lp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2); |
247 | /* power-up defaults */ | 247 | /* power-up defaults */ |
248 | SETCONF; | 248 | SETCONF; |
249 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 249 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
250 | 250 | ||
251 | if (really_reset) { | 251 | if (really_reset) { |
252 | /* reset the card */ | 252 | /* reset the card */ |
@@ -254,22 +254,22 @@ static int com20020_reset(struct net_device *dev, int really_reset) | |||
254 | mdelay(RESETtime * 2); /* COM20020 seems to be slower sometimes */ | 254 | mdelay(RESETtime * 2); /* COM20020 seems to be slower sometimes */ |
255 | } | 255 | } |
256 | /* clear flags & end reset */ | 256 | /* clear flags & end reset */ |
257 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 257 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
258 | ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear); | 258 | ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear); |
259 | 259 | ||
260 | /* verify that the ARCnet signature byte is present */ | 260 | /* verify that the ARCnet signature byte is present */ |
261 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 261 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
262 | 262 | ||
263 | com20020_copy_from_card(dev, 0, 0, &inbyte, 1); | 263 | com20020_copy_from_card(dev, 0, 0, &inbyte, 1); |
264 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 264 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
265 | if (inbyte != TESTvalue) { | 265 | if (inbyte != TESTvalue) { |
266 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 266 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
267 | BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n"); | 267 | BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n"); |
268 | return 1; | 268 | return 1; |
269 | } | 269 | } |
270 | /* enable extended (512-byte) packets */ | 270 | /* enable extended (512-byte) packets */ |
271 | ACOMMAND(CONFIGcmd | EXTconf); | 271 | ACOMMAND(CONFIGcmd | EXTconf); |
272 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 272 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
273 | 273 | ||
274 | /* done! return success. */ | 274 | /* done! return success. */ |
275 | return 0; | 275 | return 0; |