aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-roccat-koneplus.c
diff options
context:
space:
mode:
authorStefan Achatz <erazor_de@users.sourceforge.net>2011-01-30 07:38:21 -0500
committerJiri Kosina <jkosina@suse.cz>2011-02-03 10:37:27 -0500
commita28764ef80dd5aef657f810a9c295ccda421c823 (patch)
tree96f622d28f527e30ef369255d2d8d0ddc6b457ab /drivers/hid/hid-roccat-koneplus.c
parentcb38cd87862aa515cd0559473e94d4495372a590 (diff)
HID: roccat: Use new hid_err macros
Using the new hid_err macros instead of dev_err. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-roccat-koneplus.c')
-rw-r--r--drivers/hid/hid-roccat-koneplus.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index 65d7cde4c5d1..c826c0d6c872 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -116,7 +116,7 @@ static int koneplus_receive_control_status(struct usb_device *usb_dev)
116 goto out; 116 goto out;
117 } 117 }
118 118
119 dev_err(&usb_dev->dev, "koneplus_receive_control_status: " 119 hid_err(usb_dev, "koneplus_receive_control_status: "
120 "unknown response value 0x%x\n", control->value); 120 "unknown response value 0x%x\n", control->value);
121 retval = -EINVAL; 121 retval = -EINVAL;
122 goto out; 122 goto out;
@@ -658,21 +658,20 @@ static int koneplus_init_specials(struct hid_device *hdev)
658 658
659 koneplus = kzalloc(sizeof(*koneplus), GFP_KERNEL); 659 koneplus = kzalloc(sizeof(*koneplus), GFP_KERNEL);
660 if (!koneplus) { 660 if (!koneplus) {
661 dev_err(&hdev->dev, "can't alloc device descriptor\n"); 661 hid_err(hdev, "can't alloc device descriptor\n");
662 return -ENOMEM; 662 return -ENOMEM;
663 } 663 }
664 hid_set_drvdata(hdev, koneplus); 664 hid_set_drvdata(hdev, koneplus);
665 665
666 retval = koneplus_init_koneplus_device_struct(usb_dev, koneplus); 666 retval = koneplus_init_koneplus_device_struct(usb_dev, koneplus);
667 if (retval) { 667 if (retval) {
668 dev_err(&hdev->dev, 668 hid_err(hdev, "couldn't init struct koneplus_device\n");
669 "couldn't init struct koneplus_device\n");
670 goto exit_free; 669 goto exit_free;
671 } 670 }
672 671
673 retval = roccat_connect(koneplus_class, hdev); 672 retval = roccat_connect(koneplus_class, hdev);
674 if (retval < 0) { 673 if (retval < 0) {
675 dev_err(&hdev->dev, "couldn't init char dev\n"); 674 hid_err(hdev, "couldn't init char dev\n");
676 } else { 675 } else {
677 koneplus->chrdev_minor = retval; 676 koneplus->chrdev_minor = retval;
678 koneplus->roccat_claimed = 1; 677 koneplus->roccat_claimed = 1;
@@ -708,19 +707,19 @@ static int koneplus_probe(struct hid_device *hdev,
708 707
709 retval = hid_parse(hdev); 708 retval = hid_parse(hdev);
710 if (retval) { 709 if (retval) {
711 dev_err(&hdev->dev, "parse failed\n"); 710 hid_err(hdev, "parse failed\n");
712 goto exit; 711 goto exit;
713 } 712 }
714 713
715 retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT); 714 retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
716 if (retval) { 715 if (retval) {
717 dev_err(&hdev->dev, "hw start failed\n"); 716 hid_err(hdev, "hw start failed\n");
718 goto exit; 717 goto exit;
719 } 718 }
720 719
721 retval = koneplus_init_specials(hdev); 720 retval = koneplus_init_specials(hdev);
722 if (retval) { 721 if (retval) {
723 dev_err(&hdev->dev, "couldn't install mouse\n"); 722 hid_err(hdev, "couldn't install mouse\n");
724 goto exit_stop; 723 goto exit_stop;
725 } 724 }
726 725