aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2015-09-16 06:11:02 -0400
committerFelipe Balbi <balbi@ti.com>2015-09-27 11:54:31 -0400
commit18411c0f94716ec225a4f7e1d7735c80f5ec0dab (patch)
tree29ee144ea945f30eda38cc8fec0deed578f742fa
parent6e4bfc54083b2b0eff45ad2001f2a3bee9074dcc (diff)
usb: gadget: u_serial: eliminate abuse of ep->driver data
Since ep->driver_data is not used for endpoint claiming, neither for enabled/disabled state storing, we can reduce number of places where we read or modify it's value, as now it has no particular meaning for function or framework logic. In case of u_serial ep->driver_data stores pointer to struct gs_port, which is referenced in many places in code. Code using ep->driver_data to mark endpoint as enabled/disabled has been removed. Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/function/u_serial.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index 7ee057930ae7..9cc6a13d5e5b 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -876,7 +876,6 @@ static void gs_close(struct tty_struct *tty, struct file *file)
876 else 876 else
877 gs_buf_clear(&port->port_write_buf); 877 gs_buf_clear(&port->port_write_buf);
878 878
879 tty->driver_data = NULL;
880 port->port.tty = NULL; 879 port->port.tty = NULL;
881 880
882 port->openclose = false; 881 port->openclose = false;
@@ -1224,7 +1223,6 @@ int gserial_connect(struct gserial *gser, u8 port_num)
1224 1223
1225fail_out: 1224fail_out:
1226 usb_ep_disable(gser->in); 1225 usb_ep_disable(gser->in);
1227 gser->in->driver_data = NULL;
1228 return status; 1226 return status;
1229} 1227}
1230EXPORT_SYMBOL_GPL(gserial_connect); 1228EXPORT_SYMBOL_GPL(gserial_connect);
@@ -1264,10 +1262,7 @@ void gserial_disconnect(struct gserial *gser)
1264 1262
1265 /* disable endpoints, aborting down any active I/O */ 1263 /* disable endpoints, aborting down any active I/O */
1266 usb_ep_disable(gser->out); 1264 usb_ep_disable(gser->out);
1267 gser->out->driver_data = NULL;
1268
1269 usb_ep_disable(gser->in); 1265 usb_ep_disable(gser->in);
1270 gser->in->driver_data = NULL;
1271 1266
1272 /* finally, free any unused/unusable I/O buffers */ 1267 /* finally, free any unused/unusable I/O buffers */
1273 spin_lock_irqsave(&port->port_lock, flags); 1268 spin_lock_irqsave(&port->port_lock, flags);