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_param.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_param.c')
-rw-r--r-- | net/irda/ircomm/ircomm_param.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/net/irda/ircomm/ircomm_param.c b/net/irda/ircomm/ircomm_param.c index 598dcbe4a501..d57aefd9fe77 100644 --- a/net/irda/ircomm/ircomm_param.c +++ b/net/irda/ircomm/ircomm_param.c | |||
@@ -103,7 +103,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) | |||
103 | struct sk_buff *skb; | 103 | struct sk_buff *skb; |
104 | int count; | 104 | int count; |
105 | 105 | ||
106 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); | 106 | IRDA_DEBUG(2, "%s()\n", __func__ ); |
107 | 107 | ||
108 | IRDA_ASSERT(self != NULL, return -1;); | 108 | IRDA_ASSERT(self != NULL, return -1;); |
109 | IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); | 109 | IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); |
@@ -136,7 +136,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) | |||
136 | count = irda_param_insert(self, pi, skb_tail_pointer(skb), | 136 | count = irda_param_insert(self, pi, skb_tail_pointer(skb), |
137 | skb_tailroom(skb), &ircomm_param_info); | 137 | skb_tailroom(skb), &ircomm_param_info); |
138 | if (count < 0) { | 138 | if (count < 0) { |
139 | IRDA_WARNING("%s(), no room for parameter!\n", __FUNCTION__); | 139 | IRDA_WARNING("%s(), no room for parameter!\n", __func__); |
140 | spin_unlock_irqrestore(&self->spinlock, flags); | 140 | spin_unlock_irqrestore(&self->spinlock, flags); |
141 | return -1; | 141 | return -1; |
142 | } | 142 | } |
@@ -144,7 +144,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) | |||
144 | 144 | ||
145 | spin_unlock_irqrestore(&self->spinlock, flags); | 145 | spin_unlock_irqrestore(&self->spinlock, flags); |
146 | 146 | ||
147 | IRDA_DEBUG(2, "%s(), skb->len=%d\n", __FUNCTION__ , skb->len); | 147 | IRDA_DEBUG(2, "%s(), skb->len=%d\n", __func__ , skb->len); |
148 | 148 | ||
149 | if (flush) { | 149 | if (flush) { |
150 | /* ircomm_tty_do_softint will take care of the rest */ | 150 | /* ircomm_tty_do_softint will take care of the rest */ |
@@ -179,10 +179,10 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param, | |||
179 | service_type &= self->service_type; | 179 | service_type &= self->service_type; |
180 | if (!service_type) { | 180 | if (!service_type) { |
181 | IRDA_DEBUG(2, | 181 | IRDA_DEBUG(2, |
182 | "%s(), No common service type to use!\n", __FUNCTION__ ); | 182 | "%s(), No common service type to use!\n", __func__ ); |
183 | return -1; | 183 | return -1; |
184 | } | 184 | } |
185 | IRDA_DEBUG(0, "%s(), services in common=%02x\n", __FUNCTION__ , | 185 | IRDA_DEBUG(0, "%s(), services in common=%02x\n", __func__ , |
186 | service_type); | 186 | service_type); |
187 | 187 | ||
188 | /* | 188 | /* |
@@ -197,7 +197,7 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param, | |||
197 | else if (service_type & IRCOMM_3_WIRE_RAW) | 197 | else if (service_type & IRCOMM_3_WIRE_RAW) |
198 | self->settings.service_type = IRCOMM_3_WIRE_RAW; | 198 | self->settings.service_type = IRCOMM_3_WIRE_RAW; |
199 | 199 | ||
200 | IRDA_DEBUG(0, "%s(), resulting service type=0x%02x\n", __FUNCTION__ , | 200 | IRDA_DEBUG(0, "%s(), resulting service type=0x%02x\n", __func__ , |
201 | self->settings.service_type); | 201 | self->settings.service_type); |
202 | 202 | ||
203 | /* | 203 | /* |
@@ -240,7 +240,7 @@ static int ircomm_param_port_type(void *instance, irda_param_t *param, int get) | |||
240 | else { | 240 | else { |
241 | self->settings.port_type = (__u8) param->pv.i; | 241 | self->settings.port_type = (__u8) param->pv.i; |
242 | 242 | ||
243 | IRDA_DEBUG(0, "%s(), port type=%d\n", __FUNCTION__ , | 243 | IRDA_DEBUG(0, "%s(), port type=%d\n", __func__ , |
244 | self->settings.port_type); | 244 | self->settings.port_type); |
245 | } | 245 | } |
246 | return 0; | 246 | return 0; |
@@ -260,9 +260,9 @@ static int ircomm_param_port_name(void *instance, irda_param_t *param, int get) | |||
260 | IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); | 260 | IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); |
261 | 261 | ||
262 | if (get) { | 262 | if (get) { |
263 | IRDA_DEBUG(0, "%s(), not imp!\n", __FUNCTION__ ); | 263 | IRDA_DEBUG(0, "%s(), not imp!\n", __func__ ); |
264 | } else { | 264 | } else { |
265 | IRDA_DEBUG(0, "%s(), port-name=%s\n", __FUNCTION__ , param->pv.c); | 265 | IRDA_DEBUG(0, "%s(), port-name=%s\n", __func__ , param->pv.c); |
266 | strncpy(self->settings.port_name, param->pv.c, 32); | 266 | strncpy(self->settings.port_name, param->pv.c, 32); |
267 | } | 267 | } |
268 | 268 | ||
@@ -287,7 +287,7 @@ static int ircomm_param_data_rate(void *instance, irda_param_t *param, int get) | |||
287 | else | 287 | else |
288 | self->settings.data_rate = param->pv.i; | 288 | self->settings.data_rate = param->pv.i; |
289 | 289 | ||
290 | IRDA_DEBUG(2, "%s(), data rate = %d\n", __FUNCTION__ , param->pv.i); | 290 | IRDA_DEBUG(2, "%s(), data rate = %d\n", __func__ , param->pv.i); |
291 | 291 | ||
292 | return 0; | 292 | return 0; |
293 | } | 293 | } |
@@ -333,7 +333,7 @@ static int ircomm_param_flow_control(void *instance, irda_param_t *param, | |||
333 | else | 333 | else |
334 | self->settings.flow_control = (__u8) param->pv.i; | 334 | self->settings.flow_control = (__u8) param->pv.i; |
335 | 335 | ||
336 | IRDA_DEBUG(1, "%s(), flow control = 0x%02x\n", __FUNCTION__ , (__u8) param->pv.i); | 336 | IRDA_DEBUG(1, "%s(), flow control = 0x%02x\n", __func__ , (__u8) param->pv.i); |
337 | 337 | ||
338 | return 0; | 338 | return 0; |
339 | } | 339 | } |
@@ -359,7 +359,7 @@ static int ircomm_param_xon_xoff(void *instance, irda_param_t *param, int get) | |||
359 | self->settings.xonxoff[1] = (__u16) param->pv.i >> 8; | 359 | self->settings.xonxoff[1] = (__u16) param->pv.i >> 8; |
360 | } | 360 | } |
361 | 361 | ||
362 | IRDA_DEBUG(0, "%s(), XON/XOFF = 0x%02x,0x%02x\n", __FUNCTION__ , | 362 | IRDA_DEBUG(0, "%s(), XON/XOFF = 0x%02x,0x%02x\n", __func__ , |
363 | param->pv.i & 0xff, param->pv.i >> 8); | 363 | param->pv.i & 0xff, param->pv.i >> 8); |
364 | 364 | ||
365 | return 0; | 365 | return 0; |
@@ -386,7 +386,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get) | |||
386 | self->settings.enqack[1] = (__u16) param->pv.i >> 8; | 386 | self->settings.enqack[1] = (__u16) param->pv.i >> 8; |
387 | } | 387 | } |
388 | 388 | ||
389 | IRDA_DEBUG(0, "%s(), ENQ/ACK = 0x%02x,0x%02x\n", __FUNCTION__ , | 389 | IRDA_DEBUG(0, "%s(), ENQ/ACK = 0x%02x,0x%02x\n", __func__ , |
390 | param->pv.i & 0xff, param->pv.i >> 8); | 390 | param->pv.i & 0xff, param->pv.i >> 8); |
391 | 391 | ||
392 | return 0; | 392 | return 0; |
@@ -401,7 +401,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get) | |||
401 | static int ircomm_param_line_status(void *instance, irda_param_t *param, | 401 | static int ircomm_param_line_status(void *instance, irda_param_t *param, |
402 | int get) | 402 | int get) |
403 | { | 403 | { |
404 | IRDA_DEBUG(2, "%s(), not impl.\n", __FUNCTION__ ); | 404 | IRDA_DEBUG(2, "%s(), not impl.\n", __func__ ); |
405 | 405 | ||
406 | return 0; | 406 | return 0; |
407 | } | 407 | } |
@@ -462,7 +462,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get) | |||
462 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance; | 462 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance; |
463 | __u8 dce; | 463 | __u8 dce; |
464 | 464 | ||
465 | IRDA_DEBUG(1, "%s(), dce = 0x%02x\n", __FUNCTION__ , (__u8) param->pv.i); | 465 | IRDA_DEBUG(1, "%s(), dce = 0x%02x\n", __func__ , (__u8) param->pv.i); |
466 | 466 | ||
467 | dce = (__u8) param->pv.i; | 467 | dce = (__u8) param->pv.i; |
468 | 468 | ||
@@ -474,7 +474,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get) | |||
474 | /* Check if any of the settings have changed */ | 474 | /* Check if any of the settings have changed */ |
475 | if (dce & 0x0f) { | 475 | if (dce & 0x0f) { |
476 | if (dce & IRCOMM_DELTA_CTS) { | 476 | if (dce & IRCOMM_DELTA_CTS) { |
477 | IRDA_DEBUG(2, "%s(), CTS \n", __FUNCTION__ ); | 477 | IRDA_DEBUG(2, "%s(), CTS \n", __func__ ); |
478 | } | 478 | } |
479 | } | 479 | } |
480 | 480 | ||