From: Tollef Fog Heen Date: Sun, 21 Sep 2008 09:08:56 +0000 (+0200) Subject: Stylistic changes (checkpatch) X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a02ffd1881df227398cf4b3fb76ebb49c13ea8e;p=linux-2.6 Stylistic changes (checkpatch) --- diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 39dee37844..22ca0c2da5 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -134,10 +134,9 @@ static int ch341_set_baudrate(struct usb_device *dev, } t1 = factor; - for (t2 = divisor; t2 <= CH341_BAUDBASE_DIVMAX; t2++) { + for (t2 = divisor; t2 <= CH341_BAUDBASE_DIVMAX; t2++) t1 >>= 3; - } - baud = CH341_BAUDBASE_FACTOR / t1; + baud = CH341_BAUDBASE_FACTOR / t1; if (baud && tty) tty_encode_baud_rate(tty, baud, baud); @@ -282,7 +281,7 @@ error: kfree(priv); return r; } -static void ch341_close(struct tty_struct *tty, struct usb_serial_port *port, +static void ch341_close(struct tty_struct *tty, struct usb_serial_port *port, struct file *filp) { struct ch341_private *priv = usb_get_serial_port_data(port); @@ -322,11 +321,10 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port, priv->baud_rate = DEFAULT_BAUD_RATE; - if (C_CLOCAL(tty)) { + if (C_CLOCAL(tty)) priv->line_control = CH341_BIT_RTS | CH341_BIT_DTR; - } else { + else priv->line_control = 0; - } r = ch341_configure(serial->dev, priv); if (r) @@ -485,7 +483,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) while (!multi_change) { priv->delta_msr_cond = 0; - wait_event_interruptible(priv->delta_msr_wait, + wait_event_interruptible(priv->delta_msr_wait, (priv->delta_msr_cond == 1)); /* see if a signal did it */ if (signal_pending(current)) @@ -561,7 +559,7 @@ static void ch341_shutdown(struct usb_serial *serial) { struct ch341_private *priv = usb_get_serial_port_data(serial->port[0]); - dbg("%s", __FUNCTION__); + dbg("%s", __func__); kfree(priv); }