netxen, phy/marvell, skge: minor checkpatch fixes

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index d9713d933af501cea021dda49581577aeb67f6ec..45fa33e0cb9062764dc542d3c9fd428dfa6cc17f 100644 (file)
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1144,9 +1144,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
                count++;
        }
-       for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
+       for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++)
                netxen_post_rx_buffers_nodb(adapter, ctxid, ring);
-       }
 
        /* update the consumer index in phantom */
        if (count) {

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index dc4d593217c9667c63337683b5c7252d157f3265..a8fb439a4d03395a024772bda25db0fa7deab718 100644 (file)
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -166,9 +166,8 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter)
        int port = adapter->portnum;
        int pci_fn = adapter->ahw.pci_func;
 
-       if (adapter->msi_mode != MSI_MODE_MULTIFUNC) {
+       if (adapter->msi_mode != MSI_MODE_MULTIFUNC)
                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port]));
-       }
 
        if (adapter->intr_scheme != -1 &&
            adapter->intr_scheme != INTR_SCHEME_PERPORT)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index b5f4c28f6b79a3316c92aba88b76251fc482c13a..33539917e9b8008d6890e872e9d4ab7550b06d6d 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -297,7 +297,7 @@ static int m88e1145_config_init(struct phy_device *phydev)
 /* marvell_read_status
  *
  * Generic status code does not detect Fiber correctly!
- * Description: 
+ * Description:
  *   Check the link, then figure out the current state
  *   by comparing what we advertise with what the link partner
  *   advertises.  Start by checking the gigabit possibilities,

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index ae52cba75f9a7dd424f7fed0208785327345320e..2e26dced13a1ed3bb124e8432382cb13b3555af7 100644 (file)
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3200,7 +3200,7 @@ static int skge_poll(struct napi_struct *napi, int to_do)
 
        if (work_done < to_do) {
                unsigned long flags;
-               
+
                spin_lock_irqsave(&hw->hw_lock, flags);
                __netif_rx_complete(dev, napi);
                hw->intr_mask |= napimask[skge->port];