diff options
Diffstat (limited to 'drivers/hid/hid-axff.c')
-rw-r--r-- | drivers/hid/hid-axff.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c index f42ee140738a..e5b961d6ff22 100644 --- a/drivers/hid/hid-axff.c +++ b/drivers/hid/hid-axff.c | |||
@@ -73,14 +73,14 @@ static int axff_init(struct hid_device *hid) | |||
73 | int error; | 73 | int error; |
74 | 74 | ||
75 | if (list_empty(report_list)) { | 75 | if (list_empty(report_list)) { |
76 | dev_err(&hid->dev, "no output reports found\n"); | 76 | hid_err(hid, "no output reports found\n"); |
77 | return -ENODEV; | 77 | return -ENODEV; |
78 | } | 78 | } |
79 | 79 | ||
80 | report = list_first_entry(report_list, struct hid_report, list); | 80 | report = list_first_entry(report_list, struct hid_report, list); |
81 | 81 | ||
82 | if (report->maxfield < 4) { | 82 | if (report->maxfield < 4) { |
83 | dev_err(&hid->dev, "no fields in the report: %d\n", report->maxfield); | 83 | hid_err(hid, "no fields in the report: %d\n", report->maxfield); |
84 | return -ENODEV; | 84 | return -ENODEV; |
85 | } | 85 | } |
86 | 86 | ||
@@ -101,7 +101,7 @@ static int axff_init(struct hid_device *hid) | |||
101 | axff->report->field[3]->value[0] = 0x00; | 101 | axff->report->field[3]->value[0] = 0x00; |
102 | usbhid_submit_report(hid, axff->report, USB_DIR_OUT); | 102 | usbhid_submit_report(hid, axff->report, USB_DIR_OUT); |
103 | 103 | ||
104 | dev_info(&hid->dev, "Force Feedback for ACRUX game controllers by Sergei Kolzun<x0r@dv-life.ru>\n"); | 104 | hid_info(hid, "Force Feedback for ACRUX game controllers by Sergei Kolzun<x0r@dv-life.ru>\n"); |
105 | 105 | ||
106 | return 0; | 106 | return 0; |
107 | 107 | ||
@@ -114,17 +114,17 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
114 | { | 114 | { |
115 | int error; | 115 | int error; |
116 | 116 | ||
117 | dev_dbg(&hdev->dev, "ACRUX HID hardware probe..."); | 117 | dev_dbg(&hdev->dev, "ACRUX HID hardware probe...\n"); |
118 | 118 | ||
119 | error = hid_parse(hdev); | 119 | error = hid_parse(hdev); |
120 | if (error) { | 120 | if (error) { |
121 | dev_err(&hdev->dev, "parse failed\n"); | 121 | hid_err(hdev, "parse failed\n"); |
122 | return error; | 122 | return error; |
123 | } | 123 | } |
124 | 124 | ||
125 | error = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); | 125 | error = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); |
126 | if (error) { | 126 | if (error) { |
127 | dev_err(&hdev->dev, "hw start failed\n"); | 127 | hid_err(hdev, "hw start failed\n"); |
128 | return error; | 128 | return error; |
129 | } | 129 | } |
130 | 130 | ||
@@ -134,7 +134,7 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
134 | * Do not fail device initialization completely as device | 134 | * Do not fail device initialization completely as device |
135 | * may still be partially operable, just warn. | 135 | * may still be partially operable, just warn. |
136 | */ | 136 | */ |
137 | dev_warn(&hdev->dev, | 137 | hid_warn(hdev, |
138 | "Failed to enable force feedback support, error: %d\n", | 138 | "Failed to enable force feedback support, error: %d\n", |
139 | error); | 139 | error); |
140 | } | 140 | } |