Skip to content

Commit

Permalink
netxen, phy/marvell, skge: minor checkpatch fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Jeff Garzik committed Mar 26, 2008
1 parent f6f4bfa commit f0c88f9
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
3 changes: 1 addition & 2 deletions drivers/net/netxen/netxen_nic_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/netxen/netxen_nic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/phy/marvell.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/skge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit f0c88f9

Please sign in to comment.