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/belkin_sa.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/belkin_sa.c')
-rw-r--r-- | drivers/usb/serial/belkin_sa.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c index b6950648804f..5a2877c22129 100644 --- a/drivers/usb/serial/belkin_sa.c +++ b/drivers/usb/serial/belkin_sa.c | |||
@@ -195,7 +195,7 @@ static void belkin_sa_shutdown (struct usb_serial *serial) | |||
195 | struct belkin_sa_private *priv; | 195 | struct belkin_sa_private *priv; |
196 | int i; | 196 | int i; |
197 | 197 | ||
198 | dbg ("%s", __FUNCTION__); | 198 | dbg ("%s", __func__); |
199 | 199 | ||
200 | /* stop reads and writes on all ports */ | 200 | /* stop reads and writes on all ports */ |
201 | for (i=0; i < serial->num_ports; ++i) { | 201 | for (i=0; i < serial->num_ports; ++i) { |
@@ -210,7 +210,7 @@ static int belkin_sa_open (struct usb_serial_port *port, struct file *filp) | |||
210 | { | 210 | { |
211 | int retval = 0; | 211 | int retval = 0; |
212 | 212 | ||
213 | dbg("%s port %d", __FUNCTION__, port->number); | 213 | dbg("%s port %d", __func__, port->number); |
214 | 214 | ||
215 | /*Start reading from the device*/ | 215 | /*Start reading from the device*/ |
216 | /* TODO: Look at possibility of submitting multiple URBs to device to | 216 | /* TODO: Look at possibility of submitting multiple URBs to device to |
@@ -237,7 +237,7 @@ exit: | |||
237 | 237 | ||
238 | static void belkin_sa_close (struct usb_serial_port *port, struct file *filp) | 238 | static void belkin_sa_close (struct usb_serial_port *port, struct file *filp) |
239 | { | 239 | { |
240 | dbg("%s port %d", __FUNCTION__, port->number); | 240 | dbg("%s port %d", __func__, port->number); |
241 | 241 | ||
242 | /* shutdown our bulk reads and writes */ | 242 | /* shutdown our bulk reads and writes */ |
243 | usb_kill_urb(port->write_urb); | 243 | usb_kill_urb(port->write_urb); |
@@ -264,15 +264,15 @@ static void belkin_sa_read_int_callback (struct urb *urb) | |||
264 | case -ESHUTDOWN: | 264 | case -ESHUTDOWN: |
265 | /* this urb is terminated, clean up */ | 265 | /* this urb is terminated, clean up */ |
266 | dbg("%s - urb shutting down with status: %d", | 266 | dbg("%s - urb shutting down with status: %d", |
267 | __FUNCTION__, status); | 267 | __func__, status); |
268 | return; | 268 | return; |
269 | default: | 269 | default: |
270 | dbg("%s - nonzero urb status received: %d", | 270 | dbg("%s - nonzero urb status received: %d", |
271 | __FUNCTION__, status); | 271 | __func__, status); |
272 | goto exit; | 272 | goto exit; |
273 | } | 273 | } |
274 | 274 | ||
275 | usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data); | 275 | usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data); |
276 | 276 | ||
277 | /* Handle known interrupt data */ | 277 | /* Handle known interrupt data */ |
278 | /* ignore data[0] and data[1] */ | 278 | /* ignore data[0] and data[1] */ |
@@ -331,7 +331,7 @@ exit: | |||
331 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 331 | retval = usb_submit_urb (urb, GFP_ATOMIC); |
332 | if (retval) | 332 | if (retval) |
333 | err ("%s - usb_submit_urb failed with result %d", | 333 | err ("%s - usb_submit_urb failed with result %d", |
334 | __FUNCTION__, retval); | 334 | __func__, retval); |
335 | } | 335 | } |
336 | 336 | ||
337 | static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) | 337 | static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) |
@@ -478,7 +478,7 @@ static int belkin_sa_tiocmget (struct usb_serial_port *port, struct file *file) | |||
478 | unsigned long control_state; | 478 | unsigned long control_state; |
479 | unsigned long flags; | 479 | unsigned long flags; |
480 | 480 | ||
481 | dbg("%s", __FUNCTION__); | 481 | dbg("%s", __func__); |
482 | 482 | ||
483 | spin_lock_irqsave(&priv->lock, flags); | 483 | spin_lock_irqsave(&priv->lock, flags); |
484 | control_state = priv->control_state; | 484 | control_state = priv->control_state; |
@@ -499,7 +499,7 @@ static int belkin_sa_tiocmset (struct usb_serial_port *port, struct file *file, | |||
499 | int rts = 0; | 499 | int rts = 0; |
500 | int dtr = 0; | 500 | int dtr = 0; |
501 | 501 | ||
502 | dbg("%s", __FUNCTION__); | 502 | dbg("%s", __func__); |
503 | 503 | ||
504 | spin_lock_irqsave(&priv->lock, flags); | 504 | spin_lock_irqsave(&priv->lock, flags); |
505 | control_state = priv->control_state; | 505 | control_state = priv->control_state; |