aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/usb-serial.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-11-10 11:40:43 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-15 13:49:42 -0500
commit3e1f49011973ff3e67014d03cac50593004cee3c (patch)
tree00cae3b5bf58b2335af1ca2d3169b55e63c2a8f3 /drivers/usb/serial/usb-serial.c
parentd5e450ee4f6d88711879592e30c0fb1cf14bf504 (diff)
USB: serial: fix whitespace issues
Minor whitespace clean ups. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r--drivers/usb/serial/usb-serial.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index a2a0574b662a..5c4fcf8d5f98 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -50,7 +50,7 @@ static struct usb_driver usb_serial_driver = {
50 .disconnect = usb_serial_disconnect, 50 .disconnect = usb_serial_disconnect,
51 .suspend = usb_serial_suspend, 51 .suspend = usb_serial_suspend,
52 .resume = usb_serial_resume, 52 .resume = usb_serial_resume,
53 .no_dynamic_id = 1, 53 .no_dynamic_id = 1,
54 .supports_autosuspend = 1, 54 .supports_autosuspend = 1,
55}; 55};
56 56
@@ -364,7 +364,6 @@ static int serial_write(struct tty_struct *tty, const unsigned char *buf,
364 364
365 /* pass on to the driver specific version of this function */ 365 /* pass on to the driver specific version of this function */
366 retval = port->serial->type->write(tty, port, buf, count); 366 retval = port->serial->type->write(tty, port, buf, count);
367
368exit: 367exit:
369 return retval; 368 return retval;
370} 369}
@@ -690,16 +689,18 @@ static int serial_carrier_raised(struct tty_port *port)
690{ 689{
691 struct usb_serial_port *p = container_of(port, struct usb_serial_port, port); 690 struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);
692 struct usb_serial_driver *drv = p->serial->type; 691 struct usb_serial_driver *drv = p->serial->type;
692
693 if (drv->carrier_raised) 693 if (drv->carrier_raised)
694 return drv->carrier_raised(p); 694 return drv->carrier_raised(p);
695 /* No carrier control - don't block */ 695 /* No carrier control - don't block */
696 return 1; 696 return 1;
697} 697}
698 698
699static void serial_dtr_rts(struct tty_port *port, int on) 699static void serial_dtr_rts(struct tty_port *port, int on)
700{ 700{
701 struct usb_serial_port *p = container_of(port, struct usb_serial_port, port); 701 struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);
702 struct usb_serial_driver *drv = p->serial->type; 702 struct usb_serial_driver *drv = p->serial->type;
703
703 if (drv->dtr_rts) 704 if (drv->dtr_rts)
704 drv->dtr_rts(p, on); 705 drv->dtr_rts(p, on);
705} 706}
@@ -1197,7 +1198,7 @@ static const struct tty_operations serial_ops = {
1197 .open = serial_open, 1198 .open = serial_open,
1198 .close = serial_close, 1199 .close = serial_close,
1199 .write = serial_write, 1200 .write = serial_write,
1200 .hangup = serial_hangup, 1201 .hangup = serial_hangup,
1201 .write_room = serial_write_room, 1202 .write_room = serial_write_room,
1202 .ioctl = serial_ioctl, 1203 .ioctl = serial_ioctl,
1203 .set_termios = serial_set_termios, 1204 .set_termios = serial_set_termios,
@@ -1207,9 +1208,9 @@ static const struct tty_operations serial_ops = {
1207 .chars_in_buffer = serial_chars_in_buffer, 1208 .chars_in_buffer = serial_chars_in_buffer,
1208 .tiocmget = serial_tiocmget, 1209 .tiocmget = serial_tiocmget,
1209 .tiocmset = serial_tiocmset, 1210 .tiocmset = serial_tiocmset,
1210 .get_icount = serial_get_icount, 1211 .get_icount = serial_get_icount,
1211 .cleanup = serial_cleanup, 1212 .cleanup = serial_cleanup,
1212 .install = serial_install, 1213 .install = serial_install,
1213 .proc_fops = &serial_proc_fops, 1214 .proc_fops = &serial_proc_fops,
1214}; 1215};
1215 1216
@@ -1238,7 +1239,7 @@ static int __init usb_serial_init(void)
1238 1239
1239 usb_serial_tty_driver->owner = THIS_MODULE; 1240 usb_serial_tty_driver->owner = THIS_MODULE;
1240 usb_serial_tty_driver->driver_name = "usbserial"; 1241 usb_serial_tty_driver->driver_name = "usbserial";
1241 usb_serial_tty_driver->name = "ttyUSB"; 1242 usb_serial_tty_driver->name = "ttyUSB";
1242 usb_serial_tty_driver->major = SERIAL_TTY_MAJOR; 1243 usb_serial_tty_driver->major = SERIAL_TTY_MAJOR;
1243 usb_serial_tty_driver->minor_start = 0; 1244 usb_serial_tty_driver->minor_start = 0;
1244 usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; 1245 usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;