Merge "f_qc_rndis: Remove unused structure" into kernel.lnx.4.9.r27-rel (b2fc41c3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_qc_rndis.c

+3 −22

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	* Copyright (C) 2008 Nokia Corporation		* Copyright (C) 2008 Nokia Corporation
	* Copyright (C) 2009 Samsung Electronics		* Copyright (C) 2009 Samsung Electronics
	* Author: Michal Nazarewicz (mina86@mina86.com)		* Author: Michal Nazarewicz (mina86@mina86.com)
	* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.		* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2		* it under the terms of the GNU General Public License version 2
	@@ -331,18 +331,8 @@ static struct usb_endpoint_descriptor rndis_qc_ss_notify_desc = {
	.bInterval = RNDIS_QC_LOG2_STATUS_INTERVAL_MSEC + 4,		.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 = {		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,		.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,

	/* the following 3 values can be tweaked if necessary */		/* the following 3 values can be tweaked if necessary */
	@@ -351,15 +341,6 @@ static struct usb_ss_ep_comp_descriptor rndis_qc_ss_intr_comp_desc = {
	.wBytesPerInterval = cpu_to_le16(RNDIS_QC_STATUS_BYTECOUNT),		.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 = {		static struct usb_endpoint_descriptor rndis_qc_ss_in_desc = {
	.bLength = USB_DT_ENDPOINT_SIZE,		.bLength = USB_DT_ENDPOINT_SIZE,
	.bDescriptorType = USB_DT_ENDPOINT,		.bDescriptorType = USB_DT_ENDPOINT,
	@@ -379,7 +360,7 @@ static struct usb_endpoint_descriptor rndis_qc_ss_out_desc = {
	};		};

	static struct usb_ss_ep_comp_descriptor rndis_qc_ss_bulk_comp_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,		.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,

	/* the following 2 values can be tweaked if necessary */		/* the following 2 values can be tweaked if necessary */