diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-02-10 12:58:46 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-17 14:49:22 +0100 |
| commit | 41abfb36005e06276a38fdda9ba4162d2a134c54 (patch) | |
| tree | a7b1c6f4712fefe04c55322be6d9f595905c1ec4 /drivers/hid/uhid.c | |
| parent | 4a76d370f0c0508b5d6580d15eae3d40b47d837c (diff) | |
| download | linux-stable-41abfb36005e06276a38fdda9ba4162d2a134c54.tar.gz linux-stable-41abfb36005e06276a38fdda9ba4162d2a134c54.tar.bz2 linux-stable-41abfb36005e06276a38fdda9ba4162d2a134c54.zip | |
HID: uHID: remove duplicated code
uhid_hid_output_report() can be implemented through a simple call
to uhid_hid_output_raw().
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/uhid.c')
| -rw-r--r-- | drivers/hid/uhid.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c index 89de2fef46b2..49fbe97ebb16 100644 --- a/drivers/hid/uhid.c +++ b/drivers/hid/uhid.c @@ -164,27 +164,7 @@ static int uhid_hid_output_raw(struct hid_device *hid, __u8 *buf, size_t count, static int uhid_hid_output_report(struct hid_device *hid, __u8 *buf, size_t count) { - struct uhid_device *uhid = hid->driver_data; - unsigned long flags; - struct uhid_event *ev; - - if (count < 1 || count > UHID_DATA_MAX) - return -EINVAL; - - ev = kzalloc(sizeof(*ev), GFP_KERNEL); - if (!ev) - return -ENOMEM; - - ev->type = UHID_OUTPUT; - ev->u.output.size = count; - ev->u.output.rtype = UHID_OUTPUT_REPORT; - memcpy(ev->u.output.data, buf, count); - - spin_lock_irqsave(&uhid->qlock, flags); - uhid_queue(uhid, ev); - spin_unlock_irqrestore(&uhid->qlock, flags); - - return count; + return uhid_hid_output_raw(hid, buf, count, HID_OUTPUT_REPORT); } static struct hid_ll_driver uhid_hid_driver = { |