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

[mirror_ubuntu-artful-kernel.git] / drivers / net / tehuti.c

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 492bff68bf2dd35d71434d2a68861d9e90373630..80b404f2b938fc9f1202639e7a0e9be05d675406 100644 (file)
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -420,7 +420,7 @@ static int bdx_hw_start(struct bdx_priv *priv)
                  GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB);
 
 #define BDX_IRQ_TYPE   ((priv->nic->irq_type == IRQ_MSI)?0:IRQF_SHARED)
-       if ((rc = request_irq(priv->pdev->irq, &bdx_isr_napi, BDX_IRQ_TYPE,
+       if ((rc = request_irq(priv->pdev->irq, bdx_isr_napi, BDX_IRQ_TYPE,
                         ndev->name, ndev)))
                goto err_irq;
        bdx_enable_interrupts(priv);
@@ -1784,9 +1784,9 @@ static void bdx_tx_cleanup(struct bdx_priv *priv)
        }
 #endif
 
-       if (unlikely(netif_queue_stopped(priv->ndev)
-                    && netif_carrier_ok(priv->ndev)
-                    && (priv->tx_level >= BDX_MIN_TX_LEVEL))) {
+       if (unlikely(netif_queue_stopped(priv->ndev) &&
+                    netif_carrier_ok(priv->ndev) &&
+                    (priv->tx_level >= BDX_MIN_TX_LEVEL))) {
                DBG("%s: %s: TX Q WAKE level %d\n",
                    BDX_DRV_NAME, priv->ndev->name, priv->tx_level);
                netif_wake_queue(priv->ndev);
@@ -2273,8 +2273,8 @@ bdx_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal)
            (((tx_max_coal * BDX_TXF_DESC_SZ) + PCK_TH_MULT - 1)
             / PCK_TH_MULT);
 
-       if ((rx_coal > 0x7FFF) || (tx_coal > 0x7FFF)
-           || (rx_max_coal > 0xF) || (tx_max_coal > 0xF))
+       if ((rx_coal > 0x7FFF) || (tx_coal > 0x7FFF) ||
+           (rx_max_coal > 0xF) || (tx_max_coal > 0xF))
                return -EINVAL;
 
        rdintcm = INT_REG_VAL(rx_coal, GET_INT_COAL_RC(priv->rdintcm),
@@ -2347,8 +2347,8 @@ bdx_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)
                tx_size = 3;
 
        /*Is there anything to do? */
-       if ((rx_size == priv->rxf_size)
-           && (tx_size == priv->txd_size))
+       if ((rx_size == priv->rxf_size) &&
+           (tx_size == priv->txd_size))
                return 0;
 
        priv->rxf_size = rx_size;