mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 20:14:06 +02:00
HID: logitech-dj: Standardise hid_report_enum variable nomenclature
Since we will need to differentiate between the two report_enum types
soon, let's unify the naming conventions now to save confusion and/or
unnecessary/unrelated changes in upcoming commits.
{input,output}_report_enum is used in other places to let's conform.
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
This commit is contained in:
parent
e606d8329b
commit
a940aee176
|
|
@ -1858,7 +1858,7 @@ static int logi_dj_raw_event(struct hid_device *hdev,
|
|||
static int logi_dj_probe(struct hid_device *hdev,
|
||||
const struct hid_device_id *id)
|
||||
{
|
||||
struct hid_report_enum *rep_enum;
|
||||
struct hid_report_enum *input_report_enum;
|
||||
struct hid_report *rep;
|
||||
struct dj_receiver_dev *djrcv_dev;
|
||||
struct usb_interface *intf;
|
||||
|
|
@ -1903,10 +1903,10 @@ static int logi_dj_probe(struct hid_device *hdev,
|
|||
}
|
||||
}
|
||||
|
||||
rep_enum = &hdev->report_enum[HID_INPUT_REPORT];
|
||||
input_report_enum = &hdev->report_enum[HID_INPUT_REPORT];
|
||||
|
||||
/* no input reports, bail out */
|
||||
if (list_empty(&rep_enum->report_list))
|
||||
if (list_empty(&input_report_enum->report_list))
|
||||
return -ENODEV;
|
||||
|
||||
/*
|
||||
|
|
@ -1914,7 +1914,7 @@ static int logi_dj_probe(struct hid_device *hdev,
|
|||
* Note: we should theoretically check for HID++ and DJ
|
||||
* collections, but this will do.
|
||||
*/
|
||||
list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
list_for_each_entry(rep, &input_report_enum->report_list, list) {
|
||||
if (rep->application == 0xff000001)
|
||||
has_hidpp = true;
|
||||
}
|
||||
|
|
@ -1927,7 +1927,7 @@ static int logi_dj_probe(struct hid_device *hdev,
|
|||
return -ENODEV;
|
||||
|
||||
/* get the current application attached to the node */
|
||||
rep = list_first_entry(&rep_enum->report_list, struct hid_report, list);
|
||||
rep = list_first_entry(&input_report_enum->report_list, struct hid_report, list);
|
||||
djrcv_dev = dj_get_receiver_dev(hdev, id->driver_data,
|
||||
rep->application, has_hidpp);
|
||||
if (!djrcv_dev) {
|
||||
|
|
@ -1935,7 +1935,7 @@ static int logi_dj_probe(struct hid_device *hdev,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (!rep_enum->numbered)
|
||||
if (!input_report_enum->numbered)
|
||||
djrcv_dev->unnumbered_application = rep->application;
|
||||
|
||||
/* Starts the usb device and connects to upper interfaces hiddev and
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user