diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 00:33:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 00:33:03 -0400 |
commit | 938476f9237ee97480ddb091c06d67851bb4d7e9 (patch) | |
tree | 1d5f4b55e881cf1660ddb8dbd0efa499e902f2f5 /drivers/input/misc | |
parent | 8b0725c0593871106d24ed94e7a14cf2316cb21d (diff) |
USB: yealink.c: remove dbg() usage
dbg() was a very old USB-specific macro that should no longer
be used. This patch removes it from being used in the driver
and uses dev_dbg() instead.
CC: Henk Vergonet <Henk.Vergonet@gmail.com>
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r-- | drivers/input/misc/yealink.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c index 9f71bb174eed..37b126c06fc1 100644 --- a/drivers/input/misc/yealink.c +++ b/drivers/input/misc/yealink.c | |||
@@ -438,7 +438,8 @@ static void urb_irq_callback(struct urb *urb) | |||
438 | break; | 438 | break; |
439 | 439 | ||
440 | case CMD_SCANCODE: | 440 | case CMD_SCANCODE: |
441 | dbg("get scancode %x", yld->irq_data->data[0]); | 441 | dev_dbg(&yld->idev->dev, "get scancode %x\n", |
442 | yld->irq_data->data[0]); | ||
442 | 443 | ||
443 | report_key(yld, map_p1k_to_key(yld->irq_data->data[0])); | 444 | report_key(yld, map_p1k_to_key(yld->irq_data->data[0])); |
444 | break; | 445 | break; |
@@ -517,7 +518,7 @@ static int input_open(struct input_dev *dev) | |||
517 | struct yealink_dev *yld = input_get_drvdata(dev); | 518 | struct yealink_dev *yld = input_get_drvdata(dev); |
518 | int i, ret; | 519 | int i, ret; |
519 | 520 | ||
520 | dbg("%s", __func__); | 521 | dev_dbg(&yld->idev->dev, "%s\n", __func__); |
521 | 522 | ||
522 | /* force updates to device */ | 523 | /* force updates to device */ |
523 | for (i = 0; i<sizeof(yld->master); i++) | 524 | for (i = 0; i<sizeof(yld->master); i++) |
@@ -532,8 +533,9 @@ static int input_open(struct input_dev *dev) | |||
532 | yld->ctl_data->size = 10; | 533 | yld->ctl_data->size = 10; |
533 | yld->ctl_data->sum = 0x100-CMD_INIT-10; | 534 | yld->ctl_data->sum = 0x100-CMD_INIT-10; |
534 | if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) { | 535 | if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) { |
535 | dbg("%s - usb_submit_urb failed with result %d", | 536 | dev_dbg(&yld->idev->dev, |
536 | __func__, ret); | 537 | "%s - usb_submit_urb failed with result %d\n", |
538 | __func__, ret); | ||
537 | return ret; | 539 | return ret; |
538 | } | 540 | } |
539 | return 0; | 541 | return 0; |