diff options
Diffstat (limited to 'drivers/input/mouse/appletouch.c')
-rw-r--r-- | drivers/input/mouse/appletouch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c index 8dd3942f3022..32c29400f872 100644 --- a/drivers/input/mouse/appletouch.c +++ b/drivers/input/mouse/appletouch.c | |||
@@ -287,7 +287,7 @@ static void atp_reinit(struct work_struct *work) | |||
287 | retval = usb_submit_urb(dev->urb, GFP_ATOMIC); | 287 | retval = usb_submit_urb(dev->urb, GFP_ATOMIC); |
288 | if (retval) { | 288 | if (retval) { |
289 | err("%s - usb_submit_urb failed with result %d", | 289 | err("%s - usb_submit_urb failed with result %d", |
290 | __FUNCTION__, retval); | 290 | __func__, retval); |
291 | } | 291 | } |
292 | } | 292 | } |
293 | 293 | ||
@@ -379,11 +379,11 @@ static void atp_complete(struct urb* urb) | |||
379 | case -ESHUTDOWN: | 379 | case -ESHUTDOWN: |
380 | /* This urb is terminated, clean up */ | 380 | /* This urb is terminated, clean up */ |
381 | dbg("%s - urb shutting down with status: %d", | 381 | dbg("%s - urb shutting down with status: %d", |
382 | __FUNCTION__, urb->status); | 382 | __func__, urb->status); |
383 | return; | 383 | return; |
384 | default: | 384 | default: |
385 | dbg("%s - nonzero urb status received: %d", | 385 | dbg("%s - nonzero urb status received: %d", |
386 | __FUNCTION__, urb->status); | 386 | __func__, urb->status); |
387 | goto exit; | 387 | goto exit; |
388 | } | 388 | } |
389 | 389 | ||
@@ -565,7 +565,7 @@ exit: | |||
565 | retval = usb_submit_urb(dev->urb, GFP_ATOMIC); | 565 | retval = usb_submit_urb(dev->urb, GFP_ATOMIC); |
566 | if (retval) { | 566 | if (retval) { |
567 | err("%s - usb_submit_urb failed with result %d", | 567 | err("%s - usb_submit_urb failed with result %d", |
568 | __FUNCTION__, retval); | 568 | __func__, retval); |
569 | } | 569 | } |
570 | } | 570 | } |
571 | 571 | ||