Commit 83898234 authored by Benjamin Tissoires's avatar Benjamin Tissoires

HID: logitech-dj: reshuffle logi_dj_recv_forward_*

logi_dj_recv_forward_report() was only intended for DJ reports.
logi_dj_recv_forward_hidpp() is more generic at forwarding random HID
reports.

So rename logi_dj_recv_forward_report() into logi_dj_recv_forward_dj()
and logi_dj_recv_forward_hidpp() into logi_dj_recv_forward_report().
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 43cd97af
...@@ -552,8 +552,8 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev, ...@@ -552,8 +552,8 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev,
} }
} }
static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev, static void logi_dj_recv_forward_dj(struct dj_receiver_dev *djrcv_dev,
struct dj_report *dj_report) struct dj_report *dj_report)
{ {
/* We are called from atomic context (tasklet && djrcv->lock held) */ /* We are called from atomic context (tasklet && djrcv->lock held) */
struct dj_device *dj_device; struct dj_device *dj_device;
...@@ -573,8 +573,8 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev, ...@@ -573,8 +573,8 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev,
} }
} }
static void logi_dj_recv_forward_hidpp(struct dj_device *dj_dev, u8 *data, static void logi_dj_recv_forward_report(struct dj_device *dj_dev, u8 *data,
int size) int size)
{ {
/* We are called from atomic context (tasklet && djrcv->lock held) */ /* We are called from atomic context (tasklet && djrcv->lock held) */
if (hid_input_report(dj_dev->hdev, HID_INPUT_REPORT, data, size, 1)) if (hid_input_report(dj_dev->hdev, HID_INPUT_REPORT, data, size, 1))
...@@ -893,7 +893,7 @@ static int logi_dj_dj_event(struct hid_device *hdev, ...@@ -893,7 +893,7 @@ static int logi_dj_dj_event(struct hid_device *hdev,
} }
break; break;
default: default:
logi_dj_recv_forward_report(djrcv_dev, dj_report); logi_dj_recv_forward_dj(djrcv_dev, dj_report);
} }
out: out:
...@@ -948,8 +948,8 @@ static int logi_dj_hidpp_event(struct hid_device *hdev, ...@@ -948,8 +948,8 @@ static int logi_dj_hidpp_event(struct hid_device *hdev,
/* received an event for an unknown device, bail out */ /* received an event for an unknown device, bail out */
goto out; goto out;
logi_dj_recv_forward_hidpp(djrcv_dev->paired_dj_devices[device_index], logi_dj_recv_forward_report(djrcv_dev->paired_dj_devices[device_index],
data, size); data, size);
out: out:
spin_unlock_irqrestore(&djrcv_dev->lock, flags); spin_unlock_irqrestore(&djrcv_dev->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment