iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-5.10/wiimote' into for-linus

Browse Source 
- code cleanups for hid-wiimote
This commit is contained in:
Jiri Kosina 2020-10-15 20:41:00 +02:00
commit 146f9d9189
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/hid/hid-wiimote-core.c
View File

@ -1586,7 +1586,7 @@ struct wiiproto_handler {
void (*func)(struct wiimote_data *wdata, const __u8 *payload); void (*func)(struct wiimote_data *wdata, const __u8 *payload);
}; };
static struct wiiproto_handler handlers[] = { static const struct wiiproto_handler handlers[] = {
{ .id = WIIPROTO_REQ_STATUS, .size = 6, .func = handler_status }, { .id = WIIPROTO_REQ_STATUS, .size = 6, .func = handler_status },
{ .id = WIIPROTO_REQ_STATUS, .size = 2, .func = handler_status_K }, { .id = WIIPROTO_REQ_STATUS, .size = 2, .func = handler_status_K },
{ .id = WIIPROTO_REQ_DATA, .size = 21, .func = handler_data }, { .id = WIIPROTO_REQ_DATA, .size = 21, .func = handler_data },
@ -1618,19 +1618,19 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report,
u8 *raw_data, int size) u8 *raw_data, int size)
{ {
struct wiimote_data *wdata = hid_get_drvdata(hdev); struct wiimote_data *wdata = hid_get_drvdata(hdev);
struct wiiproto_handler *h; const struct wiiproto_handler *h;
int i; int i;
unsigned long flags; unsigned long flags;
if (size < 1) if (size < 1)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&wdata->state.lock, flags);
for (i = 0; handlers[i].id; ++i) { for (i = 0; handlers[i].id; ++i) {
h = &handlers[i]; h = &handlers[i];
if (h->id == raw_data[0] && h->size < size) { if (h->id == raw_data[0] && h->size < size) {
spin_lock_irqsave(&wdata->state.lock, flags);
h->func(wdata, &raw_data[1]); h->func(wdata, &raw_data[1]);
spin_unlock_irqrestore(&wdata->state.lock, flags);
break; break;
} }
} }
@ -1639,8 +1639,6 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report,
hid_warn(hdev, "Unhandled report %hhu size %d\n", raw_data[0], hid_warn(hdev, "Unhandled report %hhu size %d\n", raw_data[0],
size); size);
spin_unlock_irqrestore(&wdata->state.lock, flags);
return 0; return 0;
} }