diff options
Diffstat (limited to 'drivers/input/joystick/xpad.c')
-rw-r--r-- | drivers/input/joystick/xpad.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index b29e3affb805..87d3e7eabffd 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -418,11 +418,11 @@ static void xpad_irq_in(struct urb *urb) | |||
418 | case -ESHUTDOWN: | 418 | case -ESHUTDOWN: |
419 | /* this urb is terminated, clean up */ | 419 | /* this urb is terminated, clean up */ |
420 | dbg("%s - urb shutting down with status: %d", | 420 | dbg("%s - urb shutting down with status: %d", |
421 | __FUNCTION__, status); | 421 | __func__, status); |
422 | return; | 422 | return; |
423 | default: | 423 | default: |
424 | dbg("%s - nonzero urb status received: %d", | 424 | dbg("%s - nonzero urb status received: %d", |
425 | __FUNCTION__, status); | 425 | __func__, status); |
426 | goto exit; | 426 | goto exit; |
427 | } | 427 | } |
428 | 428 | ||
@@ -441,7 +441,7 @@ exit: | |||
441 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 441 | retval = usb_submit_urb (urb, GFP_ATOMIC); |
442 | if (retval) | 442 | if (retval) |
443 | err ("%s - usb_submit_urb failed with result %d", | 443 | err ("%s - usb_submit_urb failed with result %d", |
444 | __FUNCTION__, retval); | 444 | __func__, retval); |
445 | } | 445 | } |
446 | 446 | ||
447 | static void xpad_bulk_out(struct urb *urb) | 447 | static void xpad_bulk_out(struct urb *urb) |
@@ -477,11 +477,11 @@ static void xpad_irq_out(struct urb *urb) | |||
477 | case -ESHUTDOWN: | 477 | case -ESHUTDOWN: |
478 | /* this urb is terminated, clean up */ | 478 | /* this urb is terminated, clean up */ |
479 | dbg("%s - urb shutting down with status: %d", | 479 | dbg("%s - urb shutting down with status: %d", |
480 | __FUNCTION__, status); | 480 | __func__, status); |
481 | return; | 481 | return; |
482 | default: | 482 | default: |
483 | dbg("%s - nonzero urb status received: %d", | 483 | dbg("%s - nonzero urb status received: %d", |
484 | __FUNCTION__, status); | 484 | __func__, status); |
485 | goto exit; | 485 | goto exit; |
486 | } | 486 | } |
487 | 487 | ||
@@ -489,7 +489,7 @@ exit: | |||
489 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 489 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
490 | if (retval) | 490 | if (retval) |
491 | err("%s - usb_submit_urb failed with result %d", | 491 | err("%s - usb_submit_urb failed with result %d", |
492 | __FUNCTION__, retval); | 492 | __func__, retval); |
493 | } | 493 | } |
494 | 494 | ||
495 | static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) | 495 | static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) |