projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[deliverable/linux.git]
/
drivers
/
hid
/
hid-pl.c
diff --git
a/drivers/hid/hid-pl.c
b/drivers/hid/hid-pl.c
index 9f41e2bd84839ed085ec15cc1c88fe6266371393..06e5300d43d2945ce9bf644d421bb1f3f8c0ac9c 100644
(file)
--- a/
drivers/hid/hid-pl.c
+++ b/
drivers/hid/hid-pl.c
@@
-103,7
+103,7
@@
static int plff_init(struct hid_device *hid)
*/
if (list_empty(report_list)) {
*/
if (list_empty(report_list)) {
-
dev_err(&hid->dev
, "no output reports found\n");
+
hid_err(hid
, "no output reports found\n");
return -ENODEV;
}
return -ENODEV;
}
@@
-112,14
+112,13
@@
static int plff_init(struct hid_device *hid)
report_ptr = report_ptr->next;
if (report_ptr == report_list) {
report_ptr = report_ptr->next;
if (report_ptr == report_list) {
- dev_err(&hid->dev, "required output report is "
- "missing\n");
+ hid_err(hid, "required output report is missing\n");
return -ENODEV;
}
report = list_entry(report_ptr, struct hid_report, list);
if (report->maxfield < 1) {
return -ENODEV;
}
report = list_entry(report_ptr, struct hid_report, list);
if (report->maxfield < 1) {
-
dev_err(&hid->dev
, "no fields in the report\n");
+
hid_err(hid
, "no fields in the report\n");
return -ENODEV;
}
return -ENODEV;
}
@@
-137,7
+136,7
@@
static int plff_init(struct hid_device *hid)
weak = &report->field[3]->value[0];
debug("detected 4-field device");
} else {
weak = &report->field[3]->value[0];
debug("detected 4-field device");
} else {
-
dev_err(&hid->dev
, "not enough fields or values\n");
+
hid_err(hid
, "not enough fields or values\n");
return -ENODEV;
}
return -ENODEV;
}
@@
-164,8
+163,7
@@
static int plff_init(struct hid_device *hid)
usbhid_submit_report(hid, plff->report, USB_DIR_OUT);
}
usbhid_submit_report(hid, plff->report, USB_DIR_OUT);
}
- dev_info(&hid->dev, "Force feedback for PantherLord/GreenAsia "
- "devices by Anssi Hannula <anssi.hannula@gmail.com>\n");
+ hid_info(hid, "Force feedback for PantherLord/GreenAsia devices by Anssi Hannula <anssi.hannula@gmail.com>\n");
return 0;
}
return 0;
}
@@
-185,13
+183,13
@@
static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id)
ret = hid_parse(hdev);
if (ret) {
ret = hid_parse(hdev);
if (ret) {
-
dev_err(&hdev->
dev, "parse failed\n");
+
hid_err(h
dev, "parse failed\n");
goto err;
}
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
if (ret) {
goto err;
}
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
if (ret) {
-
dev_err(&hdev->
dev, "hw start failed\n");
+
hid_err(h
dev, "hw start failed\n");
goto err;
}
goto err;
}
This page took
0.024764 seconds
and
5
git commands to generate.