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/navman.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/navman.c')
-rw-r--r-- | drivers/usb/serial/navman.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c index ddaccbcde84d..7cea325d577c 100644 --- a/drivers/usb/serial/navman.c +++ b/drivers/usb/serial/navman.c | |||
@@ -49,15 +49,15 @@ static void navman_read_int_callback(struct urb *urb) | |||
49 | case -ESHUTDOWN: | 49 | case -ESHUTDOWN: |
50 | /* this urb is terminated, clean up */ | 50 | /* this urb is terminated, clean up */ |
51 | dbg("%s - urb shutting down with status: %d", | 51 | dbg("%s - urb shutting down with status: %d", |
52 | __FUNCTION__, status); | 52 | __func__, status); |
53 | return; | 53 | return; |
54 | default: | 54 | default: |
55 | dbg("%s - nonzero urb status received: %d", | 55 | dbg("%s - nonzero urb status received: %d", |
56 | __FUNCTION__, status); | 56 | __func__, status); |
57 | goto exit; | 57 | goto exit; |
58 | } | 58 | } |
59 | 59 | ||
60 | usb_serial_debug_data(debug, &port->dev, __FUNCTION__, | 60 | usb_serial_debug_data(debug, &port->dev, __func__, |
61 | urb->actual_length, data); | 61 | urb->actual_length, data); |
62 | 62 | ||
63 | tty = port->tty; | 63 | tty = port->tty; |
@@ -72,29 +72,29 @@ exit: | |||
72 | if (result) | 72 | if (result) |
73 | dev_err(&urb->dev->dev, | 73 | dev_err(&urb->dev->dev, |
74 | "%s - Error %d submitting interrupt urb\n", | 74 | "%s - Error %d submitting interrupt urb\n", |
75 | __FUNCTION__, result); | 75 | __func__, result); |
76 | } | 76 | } |
77 | 77 | ||
78 | static int navman_open(struct usb_serial_port *port, struct file *filp) | 78 | static int navman_open(struct usb_serial_port *port, struct file *filp) |
79 | { | 79 | { |
80 | int result = 0; | 80 | int result = 0; |
81 | 81 | ||
82 | dbg("%s - port %d", __FUNCTION__, port->number); | 82 | dbg("%s - port %d", __func__, port->number); |
83 | 83 | ||
84 | if (port->interrupt_in_urb) { | 84 | if (port->interrupt_in_urb) { |
85 | dbg("%s - adding interrupt input for treo", __FUNCTION__); | 85 | dbg("%s - adding interrupt input for treo", __func__); |
86 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); | 86 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); |
87 | if (result) | 87 | if (result) |
88 | dev_err(&port->dev, | 88 | dev_err(&port->dev, |
89 | "%s - failed submitting interrupt urb, error %d\n", | 89 | "%s - failed submitting interrupt urb, error %d\n", |
90 | __FUNCTION__, result); | 90 | __func__, result); |
91 | } | 91 | } |
92 | return result; | 92 | return result; |
93 | } | 93 | } |
94 | 94 | ||
95 | static void navman_close(struct usb_serial_port *port, struct file *filp) | 95 | static void navman_close(struct usb_serial_port *port, struct file *filp) |
96 | { | 96 | { |
97 | dbg("%s - port %d", __FUNCTION__, port->number); | 97 | dbg("%s - port %d", __func__, port->number); |
98 | 98 | ||
99 | usb_kill_urb(port->interrupt_in_urb); | 99 | usb_kill_urb(port->interrupt_in_urb); |
100 | } | 100 | } |
@@ -102,7 +102,7 @@ static void navman_close(struct usb_serial_port *port, struct file *filp) | |||
102 | static int navman_write(struct usb_serial_port *port, | 102 | static int navman_write(struct usb_serial_port *port, |
103 | const unsigned char *buf, int count) | 103 | const unsigned char *buf, int count) |
104 | { | 104 | { |
105 | dbg("%s - port %d", __FUNCTION__, port->number); | 105 | dbg("%s - port %d", __func__, port->number); |
106 | 106 | ||
107 | /* | 107 | /* |
108 | * This device can't write any data, only read from the device | 108 | * This device can't write any data, only read from the device |