lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: et131x: Fix checkpatch whitespace warnings

Browse Source 
Some of my previous hacking attempts have not been following the rules.
All fixes either lines > 80 chars or whitespace corrections (spaces->tabs etc).

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark Einon
2011-09-03 12:49:06 +01:00
committed by Greg Kroah-Hartman
parent a85fe2c626
commit 64df17c6fc
8 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/et131x/et1310_mac.c
View File

@@ -191,7 +191,8 @@ void et1310_config_mac_regs2(struct et131x_adapter *adapter)
cfg1 |= CFG1_RX_ENABLE | CFG1_TX_ENABLE | CFG1_TX_FLOW; cfg1 |= CFG1_RX_ENABLE | CFG1_TX_ENABLE | CFG1_TX_FLOW;
/* Initialize loop back to off */ /* Initialize loop back to off */
cfg1 &= ~(CFG1_LOOPBACK | CFG1_RX_FLOW); cfg1 &= ~(CFG1_LOOPBACK | CFG1_RX_FLOW);
if (adapter->flowcontrol == FLOW_RXONLY || adapter->flowcontrol == FLOW_BOTH) if (adapter->flowcontrol == FLOW_RXONLY ||
adapter->flowcontrol == FLOW_BOTH)
cfg1 |= CFG1_RX_FLOW; cfg1 |= CFG1_RX_FLOW;
writel(cfg1, &mac->cfg1); writel(cfg1, &mac->cfg1);

12
drivers/staging/et131x/et1310_phy.c
View File

@@ -465,10 +465,12 @@ void et131x_mii_check(struct et131x_adapter *adapter,
u16 register18; u16 register18;
et131x_mii_read(adapter, 0x12, &register18); et131x_mii_read(adapter, 0x12, &register18);
et131x_mii_write(adapter, 0x12, register18 | 0x4); et131x_mii_write(adapter, 0x12,
register18 | 0x4);
et131x_mii_write(adapter, 0x10, et131x_mii_write(adapter, 0x10,
register18 | 0x8402); register18 | 0x8402);
et131x_mii_write(adapter, 0x11, register18 | 511); et131x_mii_write(adapter, 0x11,
register18 | 511);
et131x_mii_write(adapter, 0x12, register18); et131x_mii_write(adapter, 0x12, register18);
} }
@@ -529,10 +531,12 @@ void et131x_mii_check(struct et131x_adapter *adapter,
u16 register18; u16 register18;
et131x_mii_read(adapter, 0x12, &register18); et131x_mii_read(adapter, 0x12, &register18);
et131x_mii_write(adapter, 0x12, register18 | 0x4); et131x_mii_write(adapter, 0x12,
register18 | 0x4);
et131x_mii_write(adapter, 0x10, et131x_mii_write(adapter, 0x10,
register18 | 0x8402); register18 | 0x8402);
et131x_mii_write(adapter, 0x11, register18 | 511); et131x_mii_write(adapter, 0x11,
register18 | 511);
et131x_mii_write(adapter, 0x12, register18); et131x_mii_write(adapter, 0x12, register18);
} }

27
drivers/staging/et131x/et1310_phy.h
View File

@@ -280,19 +280,18 @@ struct mi_regs {
#define PHY_INDEX_REG 0x10 #define PHY_INDEX_REG 0x10
#define PHY_DATA_REG 0x11 #define PHY_DATA_REG 0x11
#define PHY_MPHY_CONTROL_REG 0x12 /* #define TRU_VMI_MPHY_CONTROL_REGISTER 18 */ #define PHY_MPHY_CONTROL_REG 0x12
#define PHY_LOOPBACK_CONTROL 0x13 /* TRU_VMI_LOOPBACK_CONTROL_1_REG 19 */
#define PHY_LOOPBACK_CONTROL 0x13 /* #define TRU_VMI_LOOPBACK_CONTROL_1_REGISTER 19 */ /* TRU_VMI_LOOPBACK_CONTROL_2_REG 20 */
/* #define TRU_VMI_LOOPBACK_CONTROL_2_REGISTER 20 */ #define PHY_REGISTER_MGMT_CONTROL 0x15 /* TRU_VMI_MI_SEQ_CONTROL_REG 21 */
#define PHY_REGISTER_MGMT_CONTROL 0x15 /* #define TRU_VMI_MI_SEQ_CONTROL_REGISTER 21 */ #define PHY_CONFIG 0x16 /* TRU_VMI_CONFIGURATION_REG 22 */
#define PHY_CONFIG 0x16 /* #define TRU_VMI_CONFIGURATION_REGISTER 22 */ #define PHY_PHY_CONTROL 0x17 /* TRU_VMI_PHY_CONTROL_REG 23 */
#define PHY_PHY_CONTROL 0x17 /* #define TRU_VMI_PHY_CONTROL_REGISTER 23 */ #define PHY_INTERRUPT_MASK 0x18 /* TRU_VMI_INTERRUPT_MASK_REG 24 */
#define PHY_INTERRUPT_MASK 0x18 /* #define TRU_VMI_INTERRUPT_MASK_REGISTER 24 */ #define PHY_INTERRUPT_STATUS 0x19 /* TRU_VMI_INTERRUPT_STATUS_REG 25 */
#define PHY_INTERRUPT_STATUS 0x19 /* #define TRU_VMI_INTERRUPT_STATUS_REGISTER 25 */ #define PHY_PHY_STATUS 0x1A /* TRU_VMI_PHY_STATUS_REG 26 */
#define PHY_PHY_STATUS 0x1A /* #define TRU_VMI_PHY_STATUS_REGISTER 26 */ #define PHY_LED_1 0x1B /* TRU_VMI_LED_CONTROL_1_REG 27 */
#define PHY_LED_1 0x1B /* #define TRU_VMI_LED_CONTROL_1_REGISTER 27 */ #define PHY_LED_2 0x1C /* TRU_VMI_LED_CONTROL_2_REG 28 */
#define PHY_LED_2 0x1C /* #define TRU_VMI_LED_CONTROL_2_REGISTER 28 */ /* TRU_VMI_LINK_CONTROL_REG 29 */
/* #define TRU_VMI_LINK_CONTROL_REGISTER 29 */ /* TRU_VMI_TIMING_CONTROL_REG */
/* #define TRU_VMI_TIMING_CONTROL_REGISTER */
#endif /* _ET1310_PHY_H_ */ #endif /* _ET1310_PHY_H_ */

3
drivers/staging/et131x/et1310_tx.c
View File

@@ -641,7 +641,8 @@ static inline void free_send_packet(struct et131x_adapter *adapter,
* they point to * they point to
*/ */
do { do {
desc = (struct tx_desc *)(adapter->tx_ring.tx_desc_ring + desc = (struct tx_desc *)
(adapter->tx_ring.tx_desc_ring +
INDEX10(tcb->index_start)); INDEX10(tcb->index_start));
pci_unmap_single(adapter->pdev, pci_unmap_single(adapter->pdev,

6
drivers/staging/et131x/et131x_isr.c
View File

@@ -119,7 +119,8 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter)
u32 mask; u32 mask;
/* Enable all global interrupts */ /* Enable all global interrupts */
if (adapter->flowcontrol == FLOW_TXONLY || adapter->flowcontrol == FLOW_BOTH) if (adapter->flowcontrol == FLOW_TXONLY ||
adapter->flowcontrol == FLOW_BOTH)
mask = INT_MASK_ENABLE; mask = INT_MASK_ENABLE;
else else
mask = INT_MASK_ENABLE_NO_FLOW; mask = INT_MASK_ENABLE_NO_FLOW;
@@ -276,7 +277,8 @@ void et131x_isr_handler(struct work_struct *work)
} }
/* Handle Free Buffer Ring 0 and 1 Low interrupt */ /* Handle Free Buffer Ring 0 and 1 Low interrupt */
if (status & (ET_INTR_RXDMA_FB_R0_LOW | ET_INTR_RXDMA_FB_R1_LOW)) { if (status &
(ET_INTR_RXDMA_FB_R0_LOW | ET_INTR_RXDMA_FB_R1_LOW)) {
/* /*
* This indicates the number of unused buffers in * This indicates the number of unused buffers in
* RXDMA free buffer ring 0 is <= the limit you * RXDMA free buffer ring 0 is <= the limit you

7
drivers/staging/et131x/et131x_netdev.c
View File

@@ -408,7 +408,7 @@ void et131x_tx_timeout(struct net_device *netdev)
unsigned long flags; unsigned long flags;
/* If the device is closed, ignore the timeout */ /* If the device is closed, ignore the timeout */
if (~(adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE)); if (~(adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE))
return; return;
/* Any nonrecoverable hardware error? /* Any nonrecoverable hardware error?
@@ -453,7 +453,10 @@ void et131x_tx_timeout(struct net_device *netdev)
/* Disable device interrupts */ /* Disable device interrupts */
et131x_disable_interrupts(adapter); et131x_disable_interrupts(adapter);
/* Enable the Tx and Rx DMA engines (if not already enabled) */ /*
* Enable the Tx and Rx DMA engines
* (if not already enabled)
*/
et131x_rx_dma_enable(adapter); et131x_rx_dma_enable(adapter);
et131x_tx_dma_enable(adapter); et131x_tx_dma_enable(adapter);