]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: misc: iowarrior: use HID includes
authorOliver Neukum <oneukum@suse.com>
Wed, 25 Mar 2026 17:12:57 +0000 (18:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Mar 2026 14:47:26 +0000 (16:47 +0200)
The driver uses its own definitions for HID requests.
This leads to duplication and obfuscation. Use HID's
definitions.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://patch.msgid.link/20260325171311.384010-2-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/iowarrior.c

index 54f1bb0f71234098d188cf07d45fe5df40247751..22504c0a28416fbee1700d8ea91caea83aca8073 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/sched.h>
 #include <linux/mutex.h>
 #include <linux/poll.h>
+#include <linux/hid.h>
 #include <linux/usb/iowarrior.h>
 
 #define DRIVER_AUTHOR "Christian Lucht <lucht@codemercs.com>"
@@ -98,14 +99,13 @@ struct iowarrior {
 /*    globals   */
 /*--------------*/
 
-#define USB_REQ_GET_REPORT  0x01
 //#if 0
 static int usb_get_report(struct usb_device *dev,
                          struct usb_host_interface *inter, unsigned char type,
                          unsigned char id, void *buf, int size)
 {
        return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-                              USB_REQ_GET_REPORT,
+                              HID_REQ_GET_REPORT,
                               USB_DIR_IN | USB_TYPE_CLASS |
                               USB_RECIP_INTERFACE, (type << 8) + id,
                               inter->desc.bInterfaceNumber, buf, size,
@@ -113,14 +113,12 @@ static int usb_get_report(struct usb_device *dev,
 }
 //#endif
 
-#define USB_REQ_SET_REPORT 0x09
-
 static int usb_set_report(struct usb_interface *intf, unsigned char type,
                          unsigned char id, void *buf, int size)
 {
        return usb_control_msg(interface_to_usbdev(intf),
                               usb_sndctrlpipe(interface_to_usbdev(intf), 0),
-                              USB_REQ_SET_REPORT,
+                              HID_REQ_SET_REPORT,
                               USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                               (type << 8) + id,
                               intf->cur_altsetting->desc.bInterfaceNumber, buf,