aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2008-03-25 23:53:24 -0400
committerJeff Garzik <jeff@garzik.org>2008-03-25 23:53:24 -0400
commitf0c88f9c45f39acd017328515890481adcb32607 (patch)
treee9826b89e24b56bf49d309a49e2fc8ac33891687 /drivers
parentf6f4bfa3561a2d8e949cab0d28e0db6d2b13641d (diff)
netxen, phy/marvell, skge: minor checkpatch fixes
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/netxen/netxen_nic_init.c3
-rw-r--r--drivers/net/netxen/netxen_nic_main.c3
-rw-r--r--drivers/net/phy/marvell.c2
-rw-r--r--drivers/net/skge.c2
4 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index d9713d933af..45fa33e0cb9 100644
--- 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 dc4d593217c..a8fb439a4d0 100644
--- 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 b5f4c28f6b7..33539917e9b 100644
--- 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 ae52cba75f9..2e26dced13a 100644
--- 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];