diff options
Diffstat (limited to 'drivers/hid/hid-zpff.c')
-rw-r--r-- | drivers/hid/hid-zpff.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index b7acceabba80..f31fab012f2f 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c | |||
@@ -75,14 +75,14 @@ static int zpff_init(struct hid_device *hid) | |||
75 | int error; | 75 | int error; |
76 | 76 | ||
77 | if (list_empty(report_list)) { | 77 | if (list_empty(report_list)) { |
78 | dev_err(&hid->dev, "no output report found\n"); | 78 | hid_err(hid, "no output report found\n"); |
79 | return -ENODEV; | 79 | return -ENODEV; |
80 | } | 80 | } |
81 | 81 | ||
82 | report = list_entry(report_list->next, struct hid_report, list); | 82 | report = list_entry(report_list->next, struct hid_report, list); |
83 | 83 | ||
84 | if (report->maxfield < 4) { | 84 | if (report->maxfield < 4) { |
85 | dev_err(&hid->dev, "not enough fields in report\n"); | 85 | hid_err(hid, "not enough fields in report\n"); |
86 | return -ENODEV; | 86 | return -ENODEV; |
87 | } | 87 | } |
88 | 88 | ||
@@ -105,8 +105,7 @@ static int zpff_init(struct hid_device *hid) | |||
105 | zpff->report->field[3]->value[0] = 0x00; | 105 | zpff->report->field[3]->value[0] = 0x00; |
106 | usbhid_submit_report(hid, zpff->report, USB_DIR_OUT); | 106 | usbhid_submit_report(hid, zpff->report, USB_DIR_OUT); |
107 | 107 | ||
108 | dev_info(&hid->dev, "force feedback for Zeroplus based devices by " | 108 | hid_info(hid, "force feedback for Zeroplus based devices by Anssi Hannula <anssi.hannula@gmail.com>\n"); |
109 | "Anssi Hannula <anssi.hannula@gmail.com>\n"); | ||
110 | 109 | ||
111 | return 0; | 110 | return 0; |
112 | } | 111 | } |
@@ -123,13 +122,13 @@ static int zp_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
123 | 122 | ||
124 | ret = hid_parse(hdev); | 123 | ret = hid_parse(hdev); |
125 | if (ret) { | 124 | if (ret) { |
126 | dev_err(&hdev->dev, "parse failed\n"); | 125 | hid_err(hdev, "parse failed\n"); |
127 | goto err; | 126 | goto err; |
128 | } | 127 | } |
129 | 128 | ||
130 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); | 129 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); |
131 | if (ret) { | 130 | if (ret) { |
132 | dev_err(&hdev->dev, "hw start failed\n"); | 131 | hid_err(hdev, "hw start failed\n"); |
133 | goto err; | 132 | goto err; |
134 | } | 133 | } |
135 | 134 | ||