]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
fwserial: (coding style) open parenthesis alignments
authorDominique van den Broeck <domdevlin@free.fr>
Sat, 12 Apr 2014 13:18:12 +0000 (15:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2014 21:01:40 +0000 (14:01 -0700)
Style-only modifications to make checkpatch.pl --file --strict a bit happier.
Open parenthesis alignments.

Signed-off-by: Dominique van den Broeck <domdevlin@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fwserial/dma_fifo.c
drivers/staging/fwserial/fwserial.c

index 5e846344550484e2bb22527c0fd10c6c4dcdae33..528d0b9e7849ea6f7aefbc4eedc37d25c978b01d 100644 (file)
@@ -169,9 +169,9 @@ int dma_fifo_in(struct dma_fifo *fifo, const void *src, int n)
        memcpy(fifo->data, src + l, n - l);
 
        if (FAIL(fifo, addr_check(fifo->done, fifo->in, fifo->in + n) ||
-                       fifo->avail < n,
-                       "fifo corrupt: in:%u out:%u done:%u n:%d avail:%d",
-                       fifo->in, fifo->out, fifo->done, n, fifo->avail))
+                fifo->avail < n,
+                "fifo corrupt: in:%u out:%u done:%u n:%d avail:%d",
+                fifo->in, fifo->out, fifo->done, n, fifo->avail))
                return -ENXIO;
 
        fifo->in += n;
@@ -236,12 +236,12 @@ int dma_fifo_out_pend(struct dma_fifo *fifo, struct dma_pending *pended)
        ++fifo->open;
 
        if (FAIL(fifo, fifo->open > fifo->open_limit,
-                       "past open limit:%d (limit:%d)",
-                       fifo->open, fifo->open_limit))
+                "past open limit:%d (limit:%d)",
+                fifo->open, fifo->open_limit))
                return -ENXIO;
        if (FAIL(fifo, fifo->out & (fifo->align - 1),
-                       "fifo out unaligned:%u (align:%u)",
-                       fifo->out, fifo->align))
+                "fifo out unaligned:%u (align:%u)",
+                fifo->out, fifo->align))
                return -ENXIO;
 
        return len - n;
@@ -264,8 +264,8 @@ int dma_fifo_out_complete(struct dma_fifo *fifo, struct dma_pending *complete)
                return -EINVAL;
 
        if (FAIL(fifo, list_empty(&fifo->pending) != (fifo->open == 0),
-                       "pending list disagrees with open count:%d",
-                       fifo->open))
+                "pending list disagrees with open count:%d",
+                fifo->open))
                return -ENXIO;
 
        tmp = complete->data;
@@ -282,10 +282,10 @@ int dma_fifo_out_complete(struct dma_fifo *fifo, struct dma_pending *complete)
                }
 
                if (FAIL(fifo, pending->out != fifo->done ||
-                               addr_check(fifo->in, fifo->done, pending->next),
-                               "in:%u out:%u done:%u saved:%u next:%u",
-                               fifo->in, fifo->out, fifo->done, pending->out,
-                               pending->next))
+                        addr_check(fifo->in, fifo->done, pending->next),
+                        "in:%u out:%u done:%u saved:%u next:%u",
+                        fifo->in, fifo->out, fifo->done, pending->out,
+                        pending->next))
                        return -ENXIO;
 
                list_del_init(&pending->link);
@@ -300,7 +300,7 @@ int dma_fifo_out_complete(struct dma_fifo *fifo, struct dma_pending *complete)
        if (FAIL(fifo, fifo->open < 0, "open dma:%d < 0", fifo->open))
                return -ENXIO;
        if (FAIL(fifo, fifo->avail > fifo->size, "fifo avail:%d > size:%d",
-                       fifo->avail, fifo->size))
+                fifo->avail, fifo->size))
                return -ENXIO;
 
        return 0;
index b22142ee52625c8bce4130b24cf0e9046544a050..db3d6c7ff2191a47b2c14b7899d21ed8eaa3d809 100644 (file)
@@ -530,7 +530,7 @@ static void fwtty_emit_breaks(struct work_struct *work)
        while (n) {
                t = min(n, 16);
                c = tty_insert_flip_string_fixed_flag(&port->port, buf,
-                               TTY_BREAK, t);
+                                                     TTY_BREAK, t);
                n -= c;
                brk += c;
                if (c < t)
@@ -741,7 +741,7 @@ static int fwtty_tx(struct fwtty_port *port, bool drain)
        /* try to write as many dma transactions out as possible */
        n = -EAGAIN;
        while (!tty->stopped && !tty->hw_stopped &&
-                       !test_bit(STOP_TX, &port->flags)) {
+              !test_bit(STOP_TX, &port->flags)) {
                txn = kmem_cache_alloc(fwtty_txn_cache, GFP_ATOMIC);
                if (!txn) {
                        n = -ENOMEM;
@@ -884,7 +884,7 @@ static void fwserial_destroy(struct kref *kref)
        for (j = 0; j < num_ports; ++i, ++j) {
                port_table_corrupt |= port_table[i] != ports[j];
                WARN_ONCE(port_table_corrupt, "port_table[%d]: %p != ports[%d]: %p",
-                    i, port_table[i], j, ports[j]);
+                         i, port_table[i], j, ports[j]);
 
                port_table[i] = NULL;
        }
@@ -1257,7 +1257,7 @@ static int set_serial_info(struct fwtty_port *port,
                return -EFAULT;
 
        if (tmp.irq != 0 || tmp.port != 0 || tmp.custom_divisor != 0 ||
-                       tmp.baud_base != 400000000)
+           tmp.baud_base != 400000000)
                return -EPERM;
 
        if (!capable(CAP_SYS_ADMIN)) {