summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-roccat-arvo.c
diff options
context:
space:
mode:
authorStefan Achatz <erazor_de@users.sourceforge.net>2011-01-30 13:38:21 +0100
committerJiri Kosina <jkosina@suse.cz>2011-02-03 16:37:27 +0100
commita28764ef80dd5aef657f810a9c295ccda421c823 (patch)
tree96f622d28f527e30ef369255d2d8d0ddc6b457ab /drivers/hid/hid-roccat-arvo.c
parentHID: roccat: Remove empty function definitions for roccat chardev (diff)
downloadlinux-a28764ef80dd5aef657f810a9c295ccda421c823.tar.xz
linux-a28764ef80dd5aef657f810a9c295ccda421c823.zip
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)
arvo = kzalloc(sizeof(*arvo), GFP_KERNEL);
if (!arvo) {
- dev_err(&hdev->dev, "can't alloc device descriptor\n");
+ hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
}
hid_set_drvdata(hdev, arvo);
retval = arvo_init_arvo_device_struct(usb_dev, arvo);
if (retval) {
- dev_err(&hdev->dev,
- "couldn't init struct arvo_device\n");
+ hid_err(hdev, "couldn't init struct arvo_device\n");
goto exit_free;
}
retval = roccat_connect(arvo_class, hdev);
if (retval < 0) {
- dev_err(&hdev->dev, "couldn't init char dev\n");
+ hid_err(hdev, "couldn't init char dev\n");
} else {
arvo->chrdev_minor = retval;
arvo->roccat_claimed = 1;
@@ -406,19 +405,19 @@ static int arvo_probe(struct hid_device *hdev,
retval = hid_parse(hdev);
if (retval) {
- dev_err(&hdev->dev, "parse failed\n");
+ hid_err(hdev, "parse failed\n");
goto exit;
}
retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
if (retval) {
- dev_err(&hdev->dev, "hw start failed\n");
+ hid_err(hdev, "hw start failed\n");
goto exit;
}
retval = arvo_init_specials(hdev);
if (retval) {
- dev_err(&hdev->dev, "couldn't install keyboard\n");
+ hid_err(hdev, "couldn't install keyboard\n");
goto exit_stop;
}