Merge "usb: u_bam_dmux: Clean up dead code"
diff --git a/drivers/usb/gadget/function/u_bam_dmux.c b/drivers/usb/gadget/function/u_bam_dmux.c
index 78dfe7b..7cb90e4 100644
--- a/drivers/usb/gadget/function/u_bam_dmux.c
+++ b/drivers/usb/gadget/function/u_bam_dmux.c
@@ -102,8 +102,6 @@
enum u_bam_event_type {
U_BAM_DISCONNECT_E = 0,
U_BAM_CONNECT_E,
- U_BAM_SUSPEND_E,
- U_BAM_RESUME_E
};
struct bam_ch_info {
@@ -121,9 +119,6 @@
struct work_struct write_tobam_w;
struct work_struct write_tohost_w;
- struct usb_request *rx_req;
- struct usb_request *tx_req;
-
/* stats */
unsigned int pending_pkts_with_bam;
unsigned int pending_bytes_with_bam;
@@ -143,7 +138,6 @@
};
struct gbam_port {
- bool is_connected;
enum u_bam_event_type last_event;
unsigned int port_num;
spinlock_t port_lock_ul;
@@ -164,12 +158,6 @@
struct platform_driver pdrv;
} bam_ports[BAM_DMUX_NUM_FUNCS];
-struct u_bam_data_connect_info {
- u32 usb_bam_pipe_idx;
- u32 peer_pipe_idx;
- unsigned long usb_bam_handle;
-};
-
static void gbam_start_rx(struct gbam_port *port);
static void gbam_notify(void *p, int event, unsigned long data);
static void gbam_data_write_tobam(struct work_struct *w);
@@ -1057,7 +1045,6 @@
port->port_num = func;
/* port initialization */
- port->is_connected = false;
spin_lock_init(&port->port_lock_ul);
spin_lock_init(&port->port_lock_dl);
spin_lock_init(&port->port_lock);
@@ -1355,10 +1342,6 @@
if (ret) {
pr_err("%s: usb_ep_enable failed eptype:IN ep:%pK",
__func__, gr->in);
- usb_ep_free_request(port->port_usb->out, d->rx_req);
- d->rx_req = NULL;
- usb_ep_free_request(port->port_usb->in, d->tx_req);
- d->tx_req = NULL;
goto exit;
}
gr->in->driver_data = port;
@@ -1375,10 +1358,6 @@
__func__, gr->out);
gr->in->driver_data = NULL;
usb_ep_disable(gr->in);
- usb_ep_free_request(port->port_usb->out, d->rx_req);
- d->rx_req = NULL;
- usb_ep_free_request(port->port_usb->in, d->tx_req);
- d->tx_req = NULL;
goto exit;
}
gr->out->driver_data = port;