diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 23:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 23:47:47 -0500 |
commit | 0dc47877a3de00ceadea0005189656ae8dc52669 (patch) | |
tree | 7440a87385fe318cb42f0ae161be195f5e967d82 /net/irda/wrapper.c | |
parent | 6387c4bed539539b05fa773cf2ff26529dc3074c (diff) |
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/wrapper.c')
-rw-r--r-- | net/irda/wrapper.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c index c246983308b8..fd0995b1323a 100644 --- a/net/irda/wrapper.c +++ b/net/irda/wrapper.c | |||
@@ -106,16 +106,16 @@ int async_wrap_skb(struct sk_buff *skb, __u8 *tx_buff, int buffsize) | |||
106 | * Nothing to worry about, but we set the default number of | 106 | * Nothing to worry about, but we set the default number of |
107 | * BOF's | 107 | * BOF's |
108 | */ | 108 | */ |
109 | IRDA_DEBUG(1, "%s(), wrong magic in skb!\n", __FUNCTION__); | 109 | IRDA_DEBUG(1, "%s(), wrong magic in skb!\n", __func__); |
110 | xbofs = 10; | 110 | xbofs = 10; |
111 | } else | 111 | } else |
112 | xbofs = cb->xbofs + cb->xbofs_delay; | 112 | xbofs = cb->xbofs + cb->xbofs_delay; |
113 | 113 | ||
114 | IRDA_DEBUG(4, "%s(), xbofs=%d\n", __FUNCTION__, xbofs); | 114 | IRDA_DEBUG(4, "%s(), xbofs=%d\n", __func__, xbofs); |
115 | 115 | ||
116 | /* Check that we never use more than 115 + 48 xbofs */ | 116 | /* Check that we never use more than 115 + 48 xbofs */ |
117 | if (xbofs > 163) { | 117 | if (xbofs > 163) { |
118 | IRDA_DEBUG(0, "%s(), too many xbofs (%d)\n", __FUNCTION__, | 118 | IRDA_DEBUG(0, "%s(), too many xbofs (%d)\n", __func__, |
119 | xbofs); | 119 | xbofs); |
120 | xbofs = 163; | 120 | xbofs = 163; |
121 | } | 121 | } |
@@ -135,7 +135,7 @@ int async_wrap_skb(struct sk_buff *skb, __u8 *tx_buff, int buffsize) | |||
135 | */ | 135 | */ |
136 | if(n >= (buffsize-5)) { | 136 | if(n >= (buffsize-5)) { |
137 | IRDA_ERROR("%s(), tx buffer overflow (n=%d)\n", | 137 | IRDA_ERROR("%s(), tx buffer overflow (n=%d)\n", |
138 | __FUNCTION__, n); | 138 | __func__, n); |
139 | return n; | 139 | return n; |
140 | } | 140 | } |
141 | 141 | ||
@@ -287,7 +287,7 @@ async_unwrap_bof(struct net_device *dev, | |||
287 | /* Not supposed to happen, the previous frame is not | 287 | /* Not supposed to happen, the previous frame is not |
288 | * finished - Jean II */ | 288 | * finished - Jean II */ |
289 | IRDA_DEBUG(1, "%s(), Discarding incomplete frame\n", | 289 | IRDA_DEBUG(1, "%s(), Discarding incomplete frame\n", |
290 | __FUNCTION__); | 290 | __func__); |
291 | stats->rx_errors++; | 291 | stats->rx_errors++; |
292 | stats->rx_missed_errors++; | 292 | stats->rx_missed_errors++; |
293 | irda_device_set_media_busy(dev, TRUE); | 293 | irda_device_set_media_busy(dev, TRUE); |
@@ -360,7 +360,7 @@ async_unwrap_eof(struct net_device *dev, | |||
360 | /* Wrong CRC, discard frame! */ | 360 | /* Wrong CRC, discard frame! */ |
361 | irda_device_set_media_busy(dev, TRUE); | 361 | irda_device_set_media_busy(dev, TRUE); |
362 | 362 | ||
363 | IRDA_DEBUG(1, "%s(), crc error\n", __FUNCTION__); | 363 | IRDA_DEBUG(1, "%s(), crc error\n", __func__); |
364 | stats->rx_errors++; | 364 | stats->rx_errors++; |
365 | stats->rx_crc_errors++; | 365 | stats->rx_crc_errors++; |
366 | } | 366 | } |
@@ -386,7 +386,7 @@ async_unwrap_ce(struct net_device *dev, | |||
386 | break; | 386 | break; |
387 | 387 | ||
388 | case LINK_ESCAPE: | 388 | case LINK_ESCAPE: |
389 | IRDA_WARNING("%s: state not defined\n", __FUNCTION__); | 389 | IRDA_WARNING("%s: state not defined\n", __func__); |
390 | break; | 390 | break; |
391 | 391 | ||
392 | case BEGIN_FRAME: | 392 | case BEGIN_FRAME: |
@@ -421,7 +421,7 @@ async_unwrap_other(struct net_device *dev, | |||
421 | #endif | 421 | #endif |
422 | } else { | 422 | } else { |
423 | IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n", | 423 | IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n", |
424 | __FUNCTION__); | 424 | __func__); |
425 | rx_buff->state = OUTSIDE_FRAME; | 425 | rx_buff->state = OUTSIDE_FRAME; |
426 | } | 426 | } |
427 | break; | 427 | break; |
@@ -440,7 +440,7 @@ async_unwrap_other(struct net_device *dev, | |||
440 | rx_buff->state = INSIDE_FRAME; | 440 | rx_buff->state = INSIDE_FRAME; |
441 | } else { | 441 | } else { |
442 | IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n", | 442 | IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n", |
443 | __FUNCTION__); | 443 | __func__); |
444 | rx_buff->state = OUTSIDE_FRAME; | 444 | rx_buff->state = OUTSIDE_FRAME; |
445 | } | 445 | } |
446 | break; | 446 | break; |