diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2013-04-17 13:38:13 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 04:09:06 -0400 |
commit | a5f04b9df1113e0c16271afe5e43028f0d763f13 (patch) | |
tree | cf051c3219bcd6d1b782ad51c9a94c5ca2735467 /drivers/hid/hid-core.c | |
parent | 014642cb0a08d1b12c6089c48c7ba6002a0f6811 (diff) |
HID: debug: break out hid_dump_report() into hid-debug
No semantic changes, but hid_dump_report should be in hid-debug.c, not
in hid-core.c
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-core.c')
-rw-r--r-- | drivers/hid/hid-core.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index aa341d135867..f86dd9708ca5 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1260,8 +1260,6 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i | |||
1260 | struct hid_report_enum *report_enum; | 1260 | struct hid_report_enum *report_enum; |
1261 | struct hid_driver *hdrv; | 1261 | struct hid_driver *hdrv; |
1262 | struct hid_report *report; | 1262 | struct hid_report *report; |
1263 | char *buf; | ||
1264 | unsigned int i; | ||
1265 | int ret = 0; | 1263 | int ret = 0; |
1266 | 1264 | ||
1267 | if (!hid) | 1265 | if (!hid) |
@@ -1284,28 +1282,9 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i | |||
1284 | } | 1282 | } |
1285 | 1283 | ||
1286 | /* Avoid unnecessary overhead if debugfs is disabled */ | 1284 | /* Avoid unnecessary overhead if debugfs is disabled */ |
1287 | if (list_empty(&hid->debug_list)) | 1285 | if (!list_empty(&hid->debug_list)) |
1288 | goto nomem; | 1286 | hid_dump_report(hid, type, data, size); |
1289 | |||
1290 | buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE, GFP_ATOMIC); | ||
1291 | |||
1292 | if (!buf) | ||
1293 | goto nomem; | ||
1294 | |||
1295 | /* dump the report */ | ||
1296 | snprintf(buf, HID_DEBUG_BUFSIZE - 1, | ||
1297 | "\nreport (size %u) (%snumbered) = ", size, report_enum->numbered ? "" : "un"); | ||
1298 | hid_debug_event(hid, buf); | ||
1299 | |||
1300 | for (i = 0; i < size; i++) { | ||
1301 | snprintf(buf, HID_DEBUG_BUFSIZE - 1, | ||
1302 | " %02x", data[i]); | ||
1303 | hid_debug_event(hid, buf); | ||
1304 | } | ||
1305 | hid_debug_event(hid, "\n"); | ||
1306 | kfree(buf); | ||
1307 | 1287 | ||
1308 | nomem: | ||
1309 | report = hid_get_report(report_enum, data); | 1288 | report = hid_get_report(report_enum, data); |
1310 | 1289 | ||
1311 | if (!report) { | 1290 | if (!report) { |