drivers/net: Move && and || to end of previous line

[linux-2.6-block.git] / drivers / net / irda / vlsi_ir.c

diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 7cfb8b6593c63425e13b75488a2ee8554e289299..bd3c6b5ee76a61f56f92fe14d96b12087d3c3aef 100644 (file)
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -431,8 +431,8 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr
                memset(rd, 0, sizeof(*rd));
                rd->hw = hwmap + i;
                rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA);
-               if (rd->buf == NULL
-                   ||  !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
+               if (rd->buf == NULL ||
+                   !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
                        if (rd->buf) {
                                IRDA_ERROR("%s: failed to create PCI-MAP for %p",
                                           __func__, rd->buf);
@@ -955,8 +955,8 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb,
                }
                for(;;) {
                        do_gettimeofday(&now);
-                       if (now.tv_sec > ready.tv_sec
-                           ||  (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
+                       if (now.tv_sec > ready.tv_sec ||
+                           (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
                                break;
                        udelay(100);
                        /* must not sleep here - called under netif_tx_lock! */
@@ -1594,8 +1594,8 @@ static int vlsi_irda_init(struct net_device *ndev)
         * see include file for details why we need these 2 masks, in this order!
         */
 
-       if (pci_set_dma_mask(pdev,DMA_MASK_USED_BY_HW)
-           || pci_set_dma_mask(pdev,DMA_MASK_MSTRPAGE)) {
+       if (pci_set_dma_mask(pdev,DMA_MASK_USED_BY_HW) ||
+           pci_set_dma_mask(pdev,DMA_MASK_MSTRPAGE)) {
                IRDA_ERROR("%s: aborting due to PCI BM-DMA address limitations\n", __func__);
                return -1;
        }
@@ -1641,8 +1641,8 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        IRDA_MESSAGE("%s: IrDA PCI controller %s detected\n",
                     drivername, pci_name(pdev));
 
-       if ( !pci_resource_start(pdev,0)
-            || !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
+       if ( !pci_resource_start(pdev,0) ||
+            !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
                IRDA_ERROR("%s: bar 0 invalid", __func__);
                goto out_disable;
        }