evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netxen, phy/marvell, skge: minor checkpatch fixes

Browse source 
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Jeff Garzik 2008-03-25 23:53:24 -04:00
parent f6f4bfa356
commit f0c88f9c45
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/netxen/netxen_nic_init.c
View file

@ -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); consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
count++; 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); netxen_post_rx_buffers_nodb(adapter, ctxid, ring);
}
/* update the consumer index in phantom */ /* update the consumer index in phantom */
if (count) { if (count) {

3
drivers/net/netxen/netxen_nic_main.c
View file

@ -166,9 +166,8 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter)
int port = adapter->portnum; int port = adapter->portnum;
int pci_fn = adapter->ahw.pci_func; 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])); writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port]));
}
if (adapter->intr_scheme != -1 && if (adapter->intr_scheme != -1 &&
adapter->intr_scheme != INTR_SCHEME_PERPORT) adapter->intr_scheme != INTR_SCHEME_PERPORT)

2
drivers/net/phy/marvell.c
View file

@ -297,7 +297,7 @@ static int m88e1145_config_init(struct phy_device *phydev)
/* marvell_read_status /* marvell_read_status
* *
* Generic status code does not detect Fiber correctly! * Generic status code does not detect Fiber correctly!
* Description: * Description:
* Check the link, then figure out the current state * Check the link, then figure out the current state
* by comparing what we advertise with what the link partner * by comparing what we advertise with what the link partner
* advertises. Start by checking the gigabit possibilities, * advertises. Start by checking the gigabit possibilities,

2
drivers/net/skge.c
View file

@ -3200,7 +3200,7 @@ static int skge_poll(struct napi_struct *napi, int to_do)
if (work_done < to_do) { if (work_done < to_do) {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&hw->hw_lock, flags); spin_lock_irqsave(&hw->hw_lock, flags);
__netif_rx_complete(dev, napi); __netif_rx_complete(dev, napi);
hw->intr_mask |= napimask[skge->port]; hw->intr_mask |= napimask[skge->port];