diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-03-25 23:53:24 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-03-25 23:53:24 -0400 |
commit | f0c88f9c45f39acd017328515890481adcb32607 (patch) | |
tree | e9826b89e24b56bf49d309a49e2fc8ac33891687 /drivers/net | |
parent | f6f4bfa3561a2d8e949cab0d28e0db6d2b13641d (diff) |
netxen, phy/marvell, skge: minor checkpatch fixes
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 3 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 3 | ||||
-rw-r--r-- | drivers/net/phy/marvell.c | 2 | ||||
-rw-r--r-- | drivers/net/skge.c | 2 |
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 d9713d933af5..45fa33e0cb90 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) | |||
1144 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); | 1144 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); |
1145 | count++; | 1145 | count++; |
1146 | } | 1146 | } |
1147 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) { | 1147 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) |
1148 | netxen_post_rx_buffers_nodb(adapter, ctxid, ring); | 1148 | netxen_post_rx_buffers_nodb(adapter, ctxid, ring); |
1149 | } | ||
1150 | 1149 | ||
1151 | /* update the consumer index in phantom */ | 1150 | /* update the consumer index in phantom */ |
1152 | if (count) { | 1151 | if (count) { |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index dc4d593217c9..a8fb439a4d03 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) | |||
166 | int port = adapter->portnum; | 166 | int port = adapter->portnum; |
167 | int pci_fn = adapter->ahw.pci_func; | 167 | int pci_fn = adapter->ahw.pci_func; |
168 | 168 | ||
169 | if (adapter->msi_mode != MSI_MODE_MULTIFUNC) { | 169 | if (adapter->msi_mode != MSI_MODE_MULTIFUNC) |
170 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port])); | 170 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port])); |
171 | } | ||
172 | 171 | ||
173 | if (adapter->intr_scheme != -1 && | 172 | if (adapter->intr_scheme != -1 && |
174 | adapter->intr_scheme != INTR_SCHEME_PERPORT) | 173 | adapter->intr_scheme != INTR_SCHEME_PERPORT) |
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index b5f4c28f6b79..33539917e9b8 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) | |||
297 | /* marvell_read_status | 297 | /* marvell_read_status |
298 | * | 298 | * |
299 | * Generic status code does not detect Fiber correctly! | 299 | * Generic status code does not detect Fiber correctly! |
300 | * Description: | 300 | * Description: |
301 | * Check the link, then figure out the current state | 301 | * Check the link, then figure out the current state |
302 | * by comparing what we advertise with what the link partner | 302 | * by comparing what we advertise with what the link partner |
303 | * advertises. Start by checking the gigabit possibilities, | 303 | * advertises. Start by checking the gigabit possibilities, |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index ae52cba75f9a..2e26dced13a1 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) | |||
3200 | 3200 | ||
3201 | if (work_done < to_do) { | 3201 | if (work_done < to_do) { |
3202 | unsigned long flags; | 3202 | unsigned long flags; |
3203 | 3203 | ||
3204 | spin_lock_irqsave(&hw->hw_lock, flags); | 3204 | spin_lock_irqsave(&hw->hw_lock, flags); |
3205 | __netif_rx_complete(dev, napi); | 3205 | __netif_rx_complete(dev, napi); |
3206 | hw->intr_mask |= napimask[skge->port]; | 3206 | hw->intr_mask |= napimask[skge->port]; |