diff options
| -rw-r--r-- | drivers/usb/gadget/function/f_qc_rndis.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/usb/gadget/function/f_qc_rndis.c b/drivers/usb/gadget/function/f_qc_rndis.c index 8e558c364abc..2d62b07cb3f6 100644 --- a/drivers/usb/gadget/function/f_qc_rndis.c +++ b/drivers/usb/gadget/function/f_qc_rndis.c @@ -6,7 +6,7 @@ * Copyright (C) 2008 Nokia Corporation * Copyright (C) 2009 Samsung Electronics * Author: Michal Nazarewicz (mina86@mina86.com) - * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018, 2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -330,18 +330,8 @@ static struct usb_endpoint_descriptor rndis_qc_ss_notify_desc = { .bInterval = RNDIS_QC_LOG2_STATUS_INTERVAL_MSEC + 4, }; -static struct usb_ss_ep_comp_descriptor ss_intr_comp_desc = { - .bLength = sizeof(ss_intr_comp_desc), - .bDescriptorType = USB_DT_SS_ENDPOINT_COMP, - - /* the following 3 values can be tweaked if necessary */ - /* .bMaxBurst = 0, */ - /* .bmAttributes = 0, */ - .wBytesPerInterval = cpu_to_le16(RNDIS_QC_STATUS_BYTECOUNT), -}; - static struct usb_ss_ep_comp_descriptor rndis_qc_ss_intr_comp_desc = { - .bLength = sizeof(ss_intr_comp_desc), + .bLength = sizeof(rndis_qc_ss_intr_comp_desc), .bDescriptorType = USB_DT_SS_ENDPOINT_COMP, /* the following 3 values can be tweaked if necessary */ @@ -350,15 +340,6 @@ static struct usb_ss_ep_comp_descriptor rndis_qc_ss_intr_comp_desc = { .wBytesPerInterval = cpu_to_le16(RNDIS_QC_STATUS_BYTECOUNT), }; -static struct usb_ss_ep_comp_descriptor ss_bulk_comp_desc = { - .bLength = sizeof(ss_bulk_comp_desc), - .bDescriptorType = USB_DT_SS_ENDPOINT_COMP, - - /* the following 2 values can be tweaked if necessary */ - /* .bMaxBurst = 0, */ - /* .bmAttributes = 0, */ -}; - static struct usb_endpoint_descriptor rndis_qc_ss_in_desc = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, @@ -378,7 +359,7 @@ static struct usb_endpoint_descriptor rndis_qc_ss_out_desc = { }; static struct usb_ss_ep_comp_descriptor rndis_qc_ss_bulk_comp_desc = { - .bLength = sizeof(ss_bulk_comp_desc), + .bLength = sizeof(rndis_qc_ss_bulk_comp_desc), .bDescriptorType = USB_DT_SS_ENDPOINT_COMP, /* the following 2 values can be tweaked if necessary */ |