projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hid
/
hid-tmff.c
diff --git
a/drivers/hid/hid-tmff.c
b/drivers/hid/hid-tmff.c
index 25be4e1461bde288497ab2ed5363842934a18df4..575862b0688e4e233108f155812a5962dd38177b 100644
(file)
--- a/
drivers/hid/hid-tmff.c
+++ b/
drivers/hid/hid-tmff.c
@@
-151,28
+151,23
@@
static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
switch (field->usage[0].hid) {
case THRUSTMASTER_USAGE_FF:
if (field->report_count < 2) {
switch (field->usage[0].hid) {
case THRUSTMASTER_USAGE_FF:
if (field->report_count < 2) {
- dev_warn(&hid->dev, "ignoring FF field "
- "with report_count < 2\n");
+ hid_warn(hid, "ignoring FF field with report_count < 2\n");
continue;
}
if (field->logical_maximum ==
field->logical_minimum) {
continue;
}
if (field->logical_maximum ==
field->logical_minimum) {
- dev_warn(&hid->dev, "ignoring FF field "
- "with logical_maximum "
- "== logical_minimum\n");
+ hid_warn(hid, "ignoring FF field with logical_maximum == logical_minimum\n");
continue;
}
if (tmff->report && tmff->report != report) {
continue;
}
if (tmff->report && tmff->report != report) {
- dev_warn(&hid->dev, "ignoring FF field "
- "in other report\n");
+ hid_warn(hid, "ignoring FF field in other report\n");
continue;
}
if (tmff->ff_field && tmff->ff_field != field) {
continue;
}
if (tmff->ff_field && tmff->ff_field != field) {
- dev_warn(&hid->dev, "ignoring "
- "duplicate FF field\n");
+ hid_warn(hid, "ignoring duplicate FF field\n");
continue;
}
continue;
}
@@
-185,16
+180,15
@@
static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
break;
default:
break;
default:
- dev_warn(&hid->dev, "ignoring unknown output "
- "usage %08x\n",
- field->usage[0].hid);
+ hid_warn(hid, "ignoring unknown output usage %08x\n",
+ field->usage[0].hid);
continue;
}
}
}
if (!tmff->report) {
continue;
}
}
}
if (!tmff->report) {
-
dev_err(&hid->dev
, "can't find FF field in output reports\n");
+
hid_err(hid
, "can't find FF field in output reports\n");
error = -ENODEV;
goto fail;
}
error = -ENODEV;
goto fail;
}
@@
-203,8
+197,7
@@
static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
if (error)
goto fail;
if (error)
goto fail;
- dev_info(&hid->dev, "force feedback for ThrustMaster devices by Zinx "
- "Verituse <zinx@epicsol.org>");
+ hid_info(hid, "force feedback for ThrustMaster devices by Zinx Verituse <zinx@epicsol.org>\n");
return 0;
fail:
return 0;
fail:
@@
-224,13
+217,13
@@
static int tm_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;
}