aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/yealink.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/misc/yealink.c')
-rw-r--r--drivers/input/misc/yealink.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 46279ef2b649..8a949e7d8f4e 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -427,7 +427,7 @@ static void urb_irq_callback(struct urb *urb)
427 int ret; 427 int ret;
428 428
429 if (urb->status) 429 if (urb->status)
430 err("%s - urb status %d", __FUNCTION__, urb->status); 430 err("%s - urb status %d", __func__, urb->status);
431 431
432 switch (yld->irq_data->cmd) { 432 switch (yld->irq_data->cmd) {
433 case CMD_KEYPRESS: 433 case CMD_KEYPRESS:
@@ -449,7 +449,7 @@ static void urb_irq_callback(struct urb *urb)
449 449
450 ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC); 450 ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
451 if (ret) 451 if (ret)
452 err("%s - usb_submit_urb failed %d", __FUNCTION__, ret); 452 err("%s - usb_submit_urb failed %d", __func__, ret);
453} 453}
454 454
455static void urb_ctl_callback(struct urb *urb) 455static void urb_ctl_callback(struct urb *urb)
@@ -458,7 +458,7 @@ static void urb_ctl_callback(struct urb *urb)
458 int ret; 458 int ret;
459 459
460 if (urb->status) 460 if (urb->status)
461 err("%s - urb status %d", __FUNCTION__, urb->status); 461 err("%s - urb status %d", __func__, urb->status);
462 462
463 switch (yld->ctl_data->cmd) { 463 switch (yld->ctl_data->cmd) {
464 case CMD_KEYPRESS: 464 case CMD_KEYPRESS:
@@ -473,7 +473,7 @@ static void urb_ctl_callback(struct urb *urb)
473 } 473 }
474 474
475 if (ret) 475 if (ret)
476 err("%s - usb_submit_urb failed %d", __FUNCTION__, ret); 476 err("%s - usb_submit_urb failed %d", __func__, ret);
477} 477}
478 478
479/******************************************************************************* 479/*******************************************************************************
@@ -505,7 +505,7 @@ static int input_open(struct input_dev *dev)
505 struct yealink_dev *yld = input_get_drvdata(dev); 505 struct yealink_dev *yld = input_get_drvdata(dev);
506 int i, ret; 506 int i, ret;
507 507
508 dbg("%s", __FUNCTION__); 508 dbg("%s", __func__);
509 509
510 /* force updates to device */ 510 /* force updates to device */
511 for (i = 0; i<sizeof(yld->master); i++) 511 for (i = 0; i<sizeof(yld->master); i++)
@@ -521,7 +521,7 @@ static int input_open(struct input_dev *dev)
521 yld->ctl_data->sum = 0x100-CMD_INIT-10; 521 yld->ctl_data->sum = 0x100-CMD_INIT-10;
522 if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) { 522 if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) {
523 dbg("%s - usb_submit_urb failed with result %d", 523 dbg("%s - usb_submit_urb failed with result %d",
524 __FUNCTION__, ret); 524 __func__, ret);
525 return ret; 525 return ret;
526 } 526 }
527 return 0; 527 return 0;