linux-kernel - Re: [PATCH 08/11] HID: usbhid: remove duplicated code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 3 Feb 2014 17:09:56 +0100
From:	David Herrmann <dh.herrmann@...il.com>
To:	Benjamin Tissoires <benjamin.tissoires@...hat.com>
Cc:	Benjamin Tissoires <benjamin.tissoires@...il.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Frank Praznik <frank.praznik@...rr.com>,
	"open list:HID CORE LAYER" <linux-input@...r.kernel.org>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 08/11] HID: usbhid: remove duplicated code

Hi

On Sun, Feb 2, 2014 at 5:50 AM, Benjamin Tissoires
<benjamin.tissoires@...hat.com> wrote:
> Well, no use to keep twice the same code.

Yepp, I actually copied the code from that, so this is fine.

Reviewed-by: David Herrmann <dh.herrmann@...il.com>

Thanks
David

> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@...hat.com>
> ---
>  drivers/hid/usbhid/hid-core.c | 64 ++++++++-----------------------------------
>  1 file changed, 11 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
> index f8ca312..406497b 100644
> --- a/drivers/hid/usbhid/hid-core.c
> +++ b/drivers/hid/usbhid/hid-core.c
> @@ -915,59 +915,6 @@ static int usbhid_set_raw_report(struct hid_device *hid, unsigned int reportnum,
>         return ret;
>  }
>
> -
> -static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count,
> -               unsigned char report_type)
> -{
> -       struct usbhid_device *usbhid = hid->driver_data;
> -       struct usb_device *dev = hid_to_usb_dev(hid);
> -       struct usb_interface *intf = usbhid->intf;
> -       struct usb_host_interface *interface = intf->cur_altsetting;
> -       int ret;
> -
> -       if (usbhid->urbout && report_type != HID_FEATURE_REPORT) {
> -               int actual_length;
> -               int skipped_report_id = 0;
> -
> -               if (buf[0] == 0x0) {
> -                       /* Don't send the Report ID */
> -                       buf++;
> -                       count--;
> -                       skipped_report_id = 1;
> -               }
> -               ret = usb_interrupt_msg(dev, usbhid->urbout->pipe,
> -                       buf, count, &actual_length,
> -                       USB_CTRL_SET_TIMEOUT);
> -               /* return the number of bytes transferred */
> -               if (ret == 0) {
> -                       ret = actual_length;
> -                       /* count also the report id */
> -                       if (skipped_report_id)
> -                               ret++;
> -               }
> -       } else {
> -               int skipped_report_id = 0;
> -               int report_id = buf[0];
> -               if (buf[0] == 0x0) {
> -                       /* Don't send the Report ID */
> -                       buf++;
> -                       count--;
> -                       skipped_report_id = 1;
> -               }
> -               ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
> -                       HID_REQ_SET_REPORT,
> -                       USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
> -                       ((report_type + 1) << 8) | report_id,
> -                       interface->desc.bInterfaceNumber, buf, count,
> -                       USB_CTRL_SET_TIMEOUT);
> -               /* count also the report id, if this was a numbered report. */
> -               if (ret > 0 && skipped_report_id)
> -                       ret++;
> -       }
> -
> -       return ret;
> -}
> -
>  static int usbhid_output_report(struct hid_device *hid, __u8 *buf, size_t count)
>  {
>         struct usbhid_device *usbhid = hid->driver_data;
> @@ -998,6 +945,17 @@ static int usbhid_output_report(struct hid_device *hid, __u8 *buf, size_t count)
>         return ret;
>  }
>
> +static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf,
> +               size_t count, unsigned char report_type)
> +{
> +       struct usbhid_device *usbhid = hid->driver_data;
> +
> +       if (usbhid->urbout && report_type != HID_FEATURE_REPORT)
> +               return usbhid_output_report(hid, buf, count);
> +
> +       return usbhid_set_raw_report(hid, buf[0], buf, count, report_type);
> +}
> +
>  static void usbhid_restart_queues(struct usbhid_device *usbhid)
>  {
>         if (usbhid->urbout && !test_bit(HID_OUT_RUNNING, &usbhid->iofl))
> --
> 1.8.3.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/