diff options
Diffstat (limited to 'drivers/hid/hid-drff.c')
-rw-r--r-- | drivers/hid/hid-drff.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hid/hid-drff.c b/drivers/hid/hid-drff.c index 968b04f9b796..afcf3d67eb02 100644 --- a/drivers/hid/hid-drff.c +++ b/drivers/hid/hid-drff.c | |||
@@ -96,18 +96,18 @@ static int drff_init(struct hid_device *hid) | |||
96 | int error; | 96 | int error; |
97 | 97 | ||
98 | if (list_empty(report_list)) { | 98 | if (list_empty(report_list)) { |
99 | dev_err(&hid->dev, "no output reports found\n"); | 99 | hid_err(hid, "no output reports found\n"); |
100 | return -ENODEV; | 100 | return -ENODEV; |
101 | } | 101 | } |
102 | 102 | ||
103 | report = list_first_entry(report_list, struct hid_report, list); | 103 | report = list_first_entry(report_list, struct hid_report, list); |
104 | if (report->maxfield < 1) { | 104 | if (report->maxfield < 1) { |
105 | dev_err(&hid->dev, "no fields in the report\n"); | 105 | hid_err(hid, "no fields in the report\n"); |
106 | return -ENODEV; | 106 | return -ENODEV; |
107 | } | 107 | } |
108 | 108 | ||
109 | if (report->field[0]->report_count < 7) { | 109 | if (report->field[0]->report_count < 7) { |
110 | dev_err(&hid->dev, "not enough values in the field\n"); | 110 | hid_err(hid, "not enough values in the field\n"); |
111 | return -ENODEV; | 111 | return -ENODEV; |
112 | } | 112 | } |
113 | 113 | ||
@@ -133,8 +133,8 @@ static int drff_init(struct hid_device *hid) | |||
133 | drff->report->field[0]->value[6] = 0x00; | 133 | drff->report->field[0]->value[6] = 0x00; |
134 | usbhid_submit_report(hid, drff->report, USB_DIR_OUT); | 134 | usbhid_submit_report(hid, drff->report, USB_DIR_OUT); |
135 | 135 | ||
136 | dev_info(&hid->dev, "Force Feedback for DragonRise Inc. game " | 136 | hid_info(hid, "Force Feedback for DragonRise Inc. " |
137 | "controllers by Richard Walmsley <richwalm@gmail.com>\n"); | 137 | "game controllers by Richard Walmsley <richwalm@gmail.com>\n"); |
138 | 138 | ||
139 | return 0; | 139 | return 0; |
140 | } | 140 | } |
@@ -153,13 +153,13 @@ static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
153 | 153 | ||
154 | ret = hid_parse(hdev); | 154 | ret = hid_parse(hdev); |
155 | if (ret) { | 155 | if (ret) { |
156 | dev_err(&hdev->dev, "parse failed\n"); | 156 | hid_err(hdev, "parse failed\n"); |
157 | goto err; | 157 | goto err; |
158 | } | 158 | } |
159 | 159 | ||
160 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); | 160 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); |
161 | if (ret) { | 161 | if (ret) { |
162 | dev_err(&hdev->dev, "hw start failed\n"); | 162 | hid_err(hdev, "hw start failed\n"); |
163 | goto err; | 163 | goto err; |
164 | } | 164 | } |
165 | 165 | ||