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/irlan/irlan_provider.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/irlan/irlan_provider.c')
-rw-r--r-- | net/irda/irlan/irlan_provider.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c index 13db942812e4..3f81f81b2dfa 100644 --- a/net/irda/irlan/irlan_provider.c +++ b/net/irda/irlan/irlan_provider.c | |||
@@ -70,7 +70,7 @@ static int irlan_provider_data_indication(void *instance, void *sap, | |||
70 | struct irlan_cb *self; | 70 | struct irlan_cb *self; |
71 | __u8 code; | 71 | __u8 code; |
72 | 72 | ||
73 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 73 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
74 | 74 | ||
75 | self = (struct irlan_cb *) instance; | 75 | self = (struct irlan_cb *) instance; |
76 | 76 | ||
@@ -99,15 +99,15 @@ static int irlan_provider_data_indication(void *instance, void *sap, | |||
99 | irlan_do_provider_event(self, IRLAN_FILTER_CONFIG_CMD, skb); | 99 | irlan_do_provider_event(self, IRLAN_FILTER_CONFIG_CMD, skb); |
100 | break; | 100 | break; |
101 | case CMD_RECONNECT_DATA_CHAN: | 101 | case CMD_RECONNECT_DATA_CHAN: |
102 | IRDA_DEBUG(2, "%s(), Got RECONNECT_DATA_CHAN command\n", __FUNCTION__ ); | 102 | IRDA_DEBUG(2, "%s(), Got RECONNECT_DATA_CHAN command\n", __func__ ); |
103 | IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __FUNCTION__ ); | 103 | IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __func__ ); |
104 | break; | 104 | break; |
105 | case CMD_CLOSE_DATA_CHAN: | 105 | case CMD_CLOSE_DATA_CHAN: |
106 | IRDA_DEBUG(2, "Got CLOSE_DATA_CHAN command!\n"); | 106 | IRDA_DEBUG(2, "Got CLOSE_DATA_CHAN command!\n"); |
107 | IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __FUNCTION__ ); | 107 | IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __func__ ); |
108 | break; | 108 | break; |
109 | default: | 109 | default: |
110 | IRDA_DEBUG(2, "%s(), Unknown command!\n", __FUNCTION__ ); | 110 | IRDA_DEBUG(2, "%s(), Unknown command!\n", __func__ ); |
111 | break; | 111 | break; |
112 | } | 112 | } |
113 | return 0; | 113 | return 0; |
@@ -129,7 +129,7 @@ static void irlan_provider_connect_indication(void *instance, void *sap, | |||
129 | struct tsap_cb *tsap; | 129 | struct tsap_cb *tsap; |
130 | __u32 saddr, daddr; | 130 | __u32 saddr, daddr; |
131 | 131 | ||
132 | IRDA_DEBUG(0, "%s()\n", __FUNCTION__ ); | 132 | IRDA_DEBUG(0, "%s()\n", __func__ ); |
133 | 133 | ||
134 | self = (struct irlan_cb *) instance; | 134 | self = (struct irlan_cb *) instance; |
135 | tsap = (struct tsap_cb *) sap; | 135 | tsap = (struct tsap_cb *) sap; |
@@ -182,7 +182,7 @@ static void irlan_provider_disconnect_indication(void *instance, void *sap, | |||
182 | struct irlan_cb *self; | 182 | struct irlan_cb *self; |
183 | struct tsap_cb *tsap; | 183 | struct tsap_cb *tsap; |
184 | 184 | ||
185 | IRDA_DEBUG(4, "%s(), reason=%d\n", __FUNCTION__ , reason); | 185 | IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason); |
186 | 186 | ||
187 | self = (struct irlan_cb *) instance; | 187 | self = (struct irlan_cb *) instance; |
188 | tsap = (struct tsap_cb *) sap; | 188 | tsap = (struct tsap_cb *) sap; |
@@ -236,7 +236,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd, | |||
236 | 236 | ||
237 | IRDA_ASSERT(skb != NULL, return -RSP_PROTOCOL_ERROR;); | 237 | IRDA_ASSERT(skb != NULL, return -RSP_PROTOCOL_ERROR;); |
238 | 238 | ||
239 | IRDA_DEBUG(4, "%s(), skb->len=%d\n", __FUNCTION__ , (int)skb->len); | 239 | IRDA_DEBUG(4, "%s(), skb->len=%d\n", __func__ , (int)skb->len); |
240 | 240 | ||
241 | IRDA_ASSERT(self != NULL, return -RSP_PROTOCOL_ERROR;); | 241 | IRDA_ASSERT(self != NULL, return -RSP_PROTOCOL_ERROR;); |
242 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -RSP_PROTOCOL_ERROR;); | 242 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -RSP_PROTOCOL_ERROR;); |
@@ -266,7 +266,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd, | |||
266 | for (i=0; i<count;i++) { | 266 | for (i=0; i<count;i++) { |
267 | ret = irlan_extract_param(ptr, name, value, &val_len); | 267 | ret = irlan_extract_param(ptr, name, value, &val_len); |
268 | if (ret < 0) { | 268 | if (ret < 0) { |
269 | IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __FUNCTION__ ); | 269 | IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __func__ ); |
270 | break; | 270 | break; |
271 | } | 271 | } |
272 | ptr+=ret; | 272 | ptr+=ret; |
@@ -291,7 +291,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, | |||
291 | { | 291 | { |
292 | struct sk_buff *skb; | 292 | struct sk_buff *skb; |
293 | 293 | ||
294 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 294 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
295 | 295 | ||
296 | IRDA_ASSERT(self != NULL, return;); | 296 | IRDA_ASSERT(self != NULL, return;); |
297 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); | 297 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); |
@@ -323,7 +323,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, | |||
323 | irlan_insert_string_param(skb, "MEDIA", "802.5"); | 323 | irlan_insert_string_param(skb, "MEDIA", "802.5"); |
324 | break; | 324 | break; |
325 | default: | 325 | default: |
326 | IRDA_DEBUG(2, "%s(), unknown media type!\n", __FUNCTION__ ); | 326 | IRDA_DEBUG(2, "%s(), unknown media type!\n", __func__ ); |
327 | break; | 327 | break; |
328 | } | 328 | } |
329 | irlan_insert_short_param(skb, "IRLAN_VER", 0x0101); | 329 | irlan_insert_short_param(skb, "IRLAN_VER", 0x0101); |
@@ -347,7 +347,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, | |||
347 | irlan_insert_string_param(skb, "ACCESS_TYPE", "HOSTED"); | 347 | irlan_insert_string_param(skb, "ACCESS_TYPE", "HOSTED"); |
348 | break; | 348 | break; |
349 | default: | 349 | default: |
350 | IRDA_DEBUG(2, "%s(), Unknown access type\n", __FUNCTION__ ); | 350 | IRDA_DEBUG(2, "%s(), Unknown access type\n", __func__ ); |
351 | break; | 351 | break; |
352 | } | 352 | } |
353 | irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee); | 353 | irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee); |
@@ -367,7 +367,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, | |||
367 | irlan_filter_request(self, skb); | 367 | irlan_filter_request(self, skb); |
368 | break; | 368 | break; |
369 | default: | 369 | default: |
370 | IRDA_DEBUG(2, "%s(), Unknown command!\n", __FUNCTION__ ); | 370 | IRDA_DEBUG(2, "%s(), Unknown command!\n", __func__ ); |
371 | break; | 371 | break; |
372 | } | 372 | } |
373 | 373 | ||
@@ -385,7 +385,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self) | |||
385 | struct tsap_cb *tsap; | 385 | struct tsap_cb *tsap; |
386 | notify_t notify; | 386 | notify_t notify; |
387 | 387 | ||
388 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 388 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
389 | 389 | ||
390 | IRDA_ASSERT(self != NULL, return -1;); | 390 | IRDA_ASSERT(self != NULL, return -1;); |
391 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); | 391 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); |
@@ -406,7 +406,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self) | |||
406 | 406 | ||
407 | tsap = irttp_open_tsap(LSAP_ANY, 1, ¬ify); | 407 | tsap = irttp_open_tsap(LSAP_ANY, 1, ¬ify); |
408 | if (!tsap) { | 408 | if (!tsap) { |
409 | IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ ); | 409 | IRDA_DEBUG(2, "%s(), Got no tsap!\n", __func__ ); |
410 | return -1; | 410 | return -1; |
411 | } | 411 | } |
412 | self->provider.tsap_ctrl = tsap; | 412 | self->provider.tsap_ctrl = tsap; |