fwserial: (coding style) if/else bracket matching

Style-only modifications to make checkpatch.pl --file --strict a bit happier.
if/else bracket matching (either none or both options should be bracketed).

Signed-off-by: Dominique van den Broeck <domdevlin@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index db3d6c7..3862ddf 100644 (file)
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -638,9 +638,9 @@ static void fwtty_port_handler(struct fw_card *card,
 
        switch (tcode) {
        case TCODE_WRITE_QUADLET_REQUEST:
-               if (addr != port->rx_handler.offset || len != 4)
+               if (addr != port->rx_handler.offset || len != 4) {
                        rcode = RCODE_ADDRESS_ERROR;
-               else {
+               } else {
                        fwtty_update_port_status(port, *(unsigned *)data);
                        rcode = RCODE_COMPLETE;
                }
@@ -756,11 +756,11 @@ static int fwtty_tx(struct fwtty_port *port, bool drain)
 
                if (n < 0) {
                        kmem_cache_free(fwtty_txn_cache, txn);
-                       if (n == -EAGAIN)
+                       if (n == -EAGAIN) {
                                ++port->stats.tx_stall;
-                       else if (n == -ENODATA)
+                       } else if (n == -ENODATA) {
                                fwtty_profile_data(port->stats.txns, 0);
-                       else {
+                       } else {
                                ++port->stats.fifo_errs;
                                fwtty_err_ratelimited(port, "fifo err: %d\n",
                                                      n);
@@ -1264,8 +1264,9 @@ static int set_serial_info(struct fwtty_port *port,
                if (((tmp.flags & ~ASYNC_USR_MASK) !=
                     (port->port.flags & ~ASYNC_USR_MASK)))
                        return -EPERM;
-       } else
+       } else {
                port->port.close_delay = tmp.close_delay * HZ / 100;
+       }
 
        return 0;
 }
@@ -1308,9 +1309,9 @@ static void fwtty_set_termios(struct tty_struct *tty, struct ktermios *old)
        spin_lock_bh(&port->lock);
        baud = set_termios(port, tty);
 
-       if ((baud == 0) && (old->c_cflag & CBAUD))
+       if ((baud == 0) && (old->c_cflag & CBAUD)) {
                port->mctrl &= ~(TIOCM_DTR | TIOCM_RTS);
-       else if ((baud != 0) && !(old->c_cflag & CBAUD)) {
+       } else if ((baud != 0) && !(old->c_cflag & CBAUD)) {
                if (C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))
                        port->mctrl |= TIOCM_DTR | TIOCM_RTS;
                else
@@ -1733,8 +1734,9 @@ static inline int fwserial_send_mgmt_sync(struct fwtty_peer *peer,
                    rcode == RCODE_GENERATION) {
                        fwtty_dbg(&peer->unit, "mgmt write error: %d\n", rcode);
                        continue;
-               } else
+               } else {
                        break;
+               }
        } while (--tries > 0);
        return rcode;
 }
@@ -2744,9 +2746,9 @@ static int fwserial_parse_mgmt_write(struct fwtty_peer *peer,
                break;
 
        case FWSC_VIRT_CABLE_UNPLUG_RSP:
-               if (peer->state != FWPS_UNPLUG_PENDING)
+               if (peer->state != FWPS_UNPLUG_PENDING) {
                        rcode = RCODE_CONFLICT_ERROR;
-               else {
+               } else {
                        if (be16_to_cpu(pkt->hdr.code) & FWSC_RSP_NACK)
                                fwtty_notice(&peer->unit, "NACK unplug?\n");
                        port = peer_revert_state(peer);