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/ircomm/ircomm_ttp.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/ircomm/ircomm_ttp.c')
-rw-r--r-- | net/irda/ircomm/ircomm_ttp.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/irda/ircomm/ircomm_ttp.c b/net/irda/ircomm/ircomm_ttp.c index 712eafd0cc76..6e6509f22f60 100644 --- a/net/irda/ircomm/ircomm_ttp.c +++ b/net/irda/ircomm/ircomm_ttp.c | |||
@@ -78,7 +78,7 @@ int ircomm_open_tsap(struct ircomm_cb *self) | |||
78 | { | 78 | { |
79 | notify_t notify; | 79 | notify_t notify; |
80 | 80 | ||
81 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 81 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
82 | 82 | ||
83 | /* Register callbacks */ | 83 | /* Register callbacks */ |
84 | irda_notify_init(¬ify); | 84 | irda_notify_init(¬ify); |
@@ -93,7 +93,7 @@ int ircomm_open_tsap(struct ircomm_cb *self) | |||
93 | self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, | 93 | self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, |
94 | ¬ify); | 94 | ¬ify); |
95 | if (!self->tsap) { | 95 | if (!self->tsap) { |
96 | IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __FUNCTION__ ); | 96 | IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __func__ ); |
97 | return -1; | 97 | return -1; |
98 | } | 98 | } |
99 | self->slsap_sel = self->tsap->stsap_sel; | 99 | self->slsap_sel = self->tsap->stsap_sel; |
@@ -121,7 +121,7 @@ static int ircomm_ttp_connect_request(struct ircomm_cb *self, | |||
121 | { | 121 | { |
122 | int ret = 0; | 122 | int ret = 0; |
123 | 123 | ||
124 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 124 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
125 | 125 | ||
126 | /* Don't forget to refcount it - should be NULL anyway */ | 126 | /* Don't forget to refcount it - should be NULL anyway */ |
127 | if(userdata) | 127 | if(userdata) |
@@ -145,7 +145,7 @@ static int ircomm_ttp_connect_response(struct ircomm_cb *self, | |||
145 | { | 145 | { |
146 | int ret; | 146 | int ret; |
147 | 147 | ||
148 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 148 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
149 | 149 | ||
150 | /* Don't forget to refcount it - should be NULL anyway */ | 150 | /* Don't forget to refcount it - should be NULL anyway */ |
151 | if(userdata) | 151 | if(userdata) |
@@ -173,7 +173,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self, | |||
173 | 173 | ||
174 | IRDA_ASSERT(skb != NULL, return -1;); | 174 | IRDA_ASSERT(skb != NULL, return -1;); |
175 | 175 | ||
176 | IRDA_DEBUG(2, "%s(), clen=%d\n", __FUNCTION__ , clen); | 176 | IRDA_DEBUG(2, "%s(), clen=%d\n", __func__ , clen); |
177 | 177 | ||
178 | /* | 178 | /* |
179 | * Insert clen field, currently we either send data only, or control | 179 | * Insert clen field, currently we either send data only, or control |
@@ -190,7 +190,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self, | |||
190 | 190 | ||
191 | ret = irttp_data_request(self->tsap, skb); | 191 | ret = irttp_data_request(self->tsap, skb); |
192 | if (ret) { | 192 | if (ret) { |
193 | IRDA_ERROR("%s(), failed\n", __FUNCTION__); | 193 | IRDA_ERROR("%s(), failed\n", __func__); |
194 | /* irttp_data_request already free the packet */ | 194 | /* irttp_data_request already free the packet */ |
195 | } | 195 | } |
196 | 196 | ||
@@ -208,7 +208,7 @@ static int ircomm_ttp_data_indication(void *instance, void *sap, | |||
208 | { | 208 | { |
209 | struct ircomm_cb *self = (struct ircomm_cb *) instance; | 209 | struct ircomm_cb *self = (struct ircomm_cb *) instance; |
210 | 210 | ||
211 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 211 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
212 | 212 | ||
213 | IRDA_ASSERT(self != NULL, return -1;); | 213 | IRDA_ASSERT(self != NULL, return -1;); |
214 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); | 214 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); |
@@ -231,7 +231,7 @@ static void ircomm_ttp_connect_confirm(void *instance, void *sap, | |||
231 | struct ircomm_cb *self = (struct ircomm_cb *) instance; | 231 | struct ircomm_cb *self = (struct ircomm_cb *) instance; |
232 | struct ircomm_info info; | 232 | struct ircomm_info info; |
233 | 233 | ||
234 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 234 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
235 | 235 | ||
236 | IRDA_ASSERT(self != NULL, return;); | 236 | IRDA_ASSERT(self != NULL, return;); |
237 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); | 237 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); |
@@ -240,7 +240,7 @@ static void ircomm_ttp_connect_confirm(void *instance, void *sap, | |||
240 | 240 | ||
241 | if (max_sdu_size != TTP_SAR_DISABLE) { | 241 | if (max_sdu_size != TTP_SAR_DISABLE) { |
242 | IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n", | 242 | IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n", |
243 | __FUNCTION__); | 243 | __func__); |
244 | goto out; | 244 | goto out; |
245 | } | 245 | } |
246 | 246 | ||
@@ -272,7 +272,7 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap, | |||
272 | struct ircomm_cb *self = (struct ircomm_cb *)instance; | 272 | struct ircomm_cb *self = (struct ircomm_cb *)instance; |
273 | struct ircomm_info info; | 273 | struct ircomm_info info; |
274 | 274 | ||
275 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 275 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
276 | 276 | ||
277 | IRDA_ASSERT(self != NULL, return;); | 277 | IRDA_ASSERT(self != NULL, return;); |
278 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); | 278 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); |
@@ -281,7 +281,7 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap, | |||
281 | 281 | ||
282 | if (max_sdu_size != TTP_SAR_DISABLE) { | 282 | if (max_sdu_size != TTP_SAR_DISABLE) { |
283 | IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n", | 283 | IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n", |
284 | __FUNCTION__); | 284 | __func__); |
285 | goto out; | 285 | goto out; |
286 | } | 286 | } |
287 | 287 | ||
@@ -331,7 +331,7 @@ static void ircomm_ttp_disconnect_indication(void *instance, void *sap, | |||
331 | struct ircomm_cb *self = (struct ircomm_cb *) instance; | 331 | struct ircomm_cb *self = (struct ircomm_cb *) instance; |
332 | struct ircomm_info info; | 332 | struct ircomm_info info; |
333 | 333 | ||
334 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); | 334 | IRDA_DEBUG(2, "%s()\n", __func__ ); |
335 | 335 | ||
336 | IRDA_ASSERT(self != NULL, return;); | 336 | IRDA_ASSERT(self != NULL, return;); |
337 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); | 337 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); |
@@ -356,7 +356,7 @@ static void ircomm_ttp_flow_indication(void *instance, void *sap, | |||
356 | { | 356 | { |
357 | struct ircomm_cb *self = (struct ircomm_cb *) instance; | 357 | struct ircomm_cb *self = (struct ircomm_cb *) instance; |
358 | 358 | ||
359 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 359 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
360 | 360 | ||
361 | IRDA_ASSERT(self != NULL, return;); | 361 | IRDA_ASSERT(self != NULL, return;); |
362 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); | 362 | IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); |