diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 19:08:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:55 -0400 |
commit | 441b62c1edb986827154768d89bbac0ba779984f (patch) | |
tree | 13724c22d1b190a36f0ddbba38554e6c66bea6af /drivers/usb/serial/keyspan_pda.c | |
parent | 14722ef4acedc643f0b78b7165ceff2d300dae4d (diff) |
USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/keyspan_pda.c')
-rw-r--r-- | drivers/usb/serial/keyspan_pda.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 039847795185..6ce292ef1c47 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
@@ -208,7 +208,7 @@ static void keyspan_pda_request_unthrottle(struct work_struct *work) | |||
208 | 2000); | 208 | 2000); |
209 | if (result < 0) | 209 | if (result < 0) |
210 | dbg("%s - error %d from usb_control_msg", | 210 | dbg("%s - error %d from usb_control_msg", |
211 | __FUNCTION__, result); | 211 | __func__, result); |
212 | } | 212 | } |
213 | 213 | ||
214 | 214 | ||
@@ -232,11 +232,11 @@ static void keyspan_pda_rx_interrupt (struct urb *urb) | |||
232 | case -ESHUTDOWN: | 232 | case -ESHUTDOWN: |
233 | /* this urb is terminated, clean up */ | 233 | /* this urb is terminated, clean up */ |
234 | dbg("%s - urb shutting down with status: %d", | 234 | dbg("%s - urb shutting down with status: %d", |
235 | __FUNCTION__, status); | 235 | __func__, status); |
236 | return; | 236 | return; |
237 | default: | 237 | default: |
238 | dbg("%s - nonzero urb status received: %d", | 238 | dbg("%s - nonzero urb status received: %d", |
239 | __FUNCTION__, status); | 239 | __func__, status); |
240 | goto exit; | 240 | goto exit; |
241 | } | 241 | } |
242 | 242 | ||
@@ -274,7 +274,7 @@ exit: | |||
274 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 274 | retval = usb_submit_urb (urb, GFP_ATOMIC); |
275 | if (retval) | 275 | if (retval) |
276 | err ("%s - usb_submit_urb failed with result %d", | 276 | err ("%s - usb_submit_urb failed with result %d", |
277 | __FUNCTION__, retval); | 277 | __func__, retval); |
278 | } | 278 | } |
279 | 279 | ||
280 | 280 | ||
@@ -358,7 +358,7 @@ static void keyspan_pda_break_ctl (struct usb_serial_port *port, int break_state | |||
358 | value, 0, NULL, 0, 2000); | 358 | value, 0, NULL, 0, 2000); |
359 | if (result < 0) | 359 | if (result < 0) |
360 | dbg("%s - error %d from usb_control_msg", | 360 | dbg("%s - error %d from usb_control_msg", |
361 | __FUNCTION__, result); | 361 | __func__, result); |
362 | /* there is something funky about this.. the TCSBRK that 'cu' performs | 362 | /* there is something funky about this.. the TCSBRK that 'cu' performs |
363 | ought to translate into a break_ctl(-1),break_ctl(0) pair HZ/4 | 363 | ought to translate into a break_ctl(-1),break_ctl(0) pair HZ/4 |
364 | seconds apart, but it feels like the break sent isn't as long as it | 364 | seconds apart, but it feels like the break sent isn't as long as it |
@@ -665,11 +665,11 @@ static int keyspan_pda_open (struct usb_serial_port *port, struct file *filp) | |||
665 | 1, | 665 | 1, |
666 | 2000); | 666 | 2000); |
667 | if (rc < 0) { | 667 | if (rc < 0) { |
668 | dbg("%s - roomquery failed", __FUNCTION__); | 668 | dbg("%s - roomquery failed", __func__); |
669 | goto error; | 669 | goto error; |
670 | } | 670 | } |
671 | if (rc == 0) { | 671 | if (rc == 0) { |
672 | dbg("%s - roomquery returned 0 bytes", __FUNCTION__); | 672 | dbg("%s - roomquery returned 0 bytes", __func__); |
673 | rc = -EIO; | 673 | rc = -EIO; |
674 | goto error; | 674 | goto error; |
675 | } | 675 | } |
@@ -688,7 +688,7 @@ static int keyspan_pda_open (struct usb_serial_port *port, struct file *filp) | |||
688 | port->interrupt_in_urb->dev = serial->dev; | 688 | port->interrupt_in_urb->dev = serial->dev; |
689 | rc = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); | 689 | rc = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); |
690 | if (rc) { | 690 | if (rc) { |
691 | dbg("%s - usb_submit_urb(read int) failed", __FUNCTION__); | 691 | dbg("%s - usb_submit_urb(read int) failed", __func__); |
692 | goto error; | 692 | goto error; |
693 | } | 693 | } |
694 | 694 | ||
@@ -732,7 +732,7 @@ static int keyspan_pda_fake_startup (struct usb_serial *serial) | |||
732 | record = &xircom_pgs_firmware[0]; | 732 | record = &xircom_pgs_firmware[0]; |
733 | #endif | 733 | #endif |
734 | if (record == NULL) { | 734 | if (record == NULL) { |
735 | err("%s: unknown vendor, aborting.", __FUNCTION__); | 735 | err("%s: unknown vendor, aborting.", __func__); |
736 | return -ENODEV; | 736 | return -ENODEV; |
737 | } | 737 | } |
738 | 738 | ||
@@ -779,7 +779,7 @@ static int keyspan_pda_startup (struct usb_serial *serial) | |||
779 | 779 | ||
780 | static void keyspan_pda_shutdown (struct usb_serial *serial) | 780 | static void keyspan_pda_shutdown (struct usb_serial *serial) |
781 | { | 781 | { |
782 | dbg("%s", __FUNCTION__); | 782 | dbg("%s", __func__); |
783 | 783 | ||
784 | kfree(usb_get_serial_port_data(serial->port[0])); | 784 | kfree(usb_get_serial_port_data(serial->port[0])); |
785 | } | 785 | } |