aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-roccat-arvo.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-arvo.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-arvo.c')
-rw-r--r--drivers/hid/hid-roccat-arvo.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c
index 8facbd3efd72..ebf3c15f1a7e 100644
--- a/drivers/hid/hid-roccat-arvo.c
+++ b/drivers/hid/hid-roccat-arvo.c
@@ -358,21 +358,20 @@ static int arvo_init_specials(struct hid_device *hdev)
358 358
359 arvo = kzalloc(sizeof(*arvo), GFP_KERNEL); 359 arvo = kzalloc(sizeof(*arvo), GFP_KERNEL);
360 if (!arvo) { 360 if (!arvo) {
361 dev_err(&hdev->dev, "can't alloc device descriptor\n"); 361 hid_err(hdev, "can't alloc device descriptor\n");
362 return -ENOMEM; 362 return -ENOMEM;
363 } 363 }
364 hid_set_drvdata(hdev, arvo); 364 hid_set_drvdata(hdev, arvo);
365 365
366 retval = arvo_init_arvo_device_struct(usb_dev, arvo); 366 retval = arvo_init_arvo_device_struct(usb_dev, arvo);
367 if (retval) { 367 if (retval) {
368 dev_err(&hdev->dev, 368 hid_err(hdev, "couldn't init struct arvo_device\n");
369 "couldn't init struct arvo_device\n");
370 goto exit_free; 369 goto exit_free;
371 } 370 }
372 371
373 retval = roccat_connect(arvo_class, hdev); 372 retval = roccat_connect(arvo_class, hdev);
374 if (retval < 0) { 373 if (retval < 0) {
375 dev_err(&hdev->dev, "couldn't init char dev\n"); 374 hid_err(hdev, "couldn't init char dev\n");
376 } else { 375 } else {
377 arvo->chrdev_minor = retval; 376 arvo->chrdev_minor = retval;
378 arvo->roccat_claimed = 1; 377 arvo->roccat_claimed = 1;
@@ -406,19 +405,19 @@ static int arvo_probe(struct hid_device *hdev,
406 405
407 retval = hid_parse(hdev); 406 retval = hid_parse(hdev);
408 if (retval) { 407 if (retval) {
409 dev_err(&hdev->dev, "parse failed\n"); 408 hid_err(hdev, "parse failed\n");
410 goto exit; 409 goto exit;
411 } 410 }
412 411
413 retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT); 412 retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
414 if (retval) { 413 if (retval) {
415 dev_err(&hdev->dev, "hw start failed\n"); 414 hid_err(hdev, "hw start failed\n");
416 goto exit; 415 goto exit;
417 } 416 }
418 417
419 retval = arvo_init_specials(hdev); 418 retval = arvo_init_specials(hdev);
420 if (retval) { 419 if (retval) {
421 dev_err(&hdev->dev, "couldn't install keyboard\n"); 420 hid_err(hdev, "couldn't install keyboard\n");
422 goto exit_stop; 421 goto exit_stop;
423 } 422 }
424 423