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

5
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);
@@ -287,7 +288,7 @@ void et1310_config_rxmac_regs(struct et131x_adapter *adapter)
writel(sa_lo, &rxmac->sa_lo); writel(sa_lo, &rxmac->sa_lo);
sa_hi = (u32) (adapter->addr[0] << ET_WOL_HI_SA1_SHIFT) | sa_hi = (u32) (adapter->addr[0] << ET_WOL_HI_SA1_SHIFT) |
adapter->addr[1]; adapter->addr[1];
writel(sa_hi, &rxmac->sa_hi); writel(sa_hi, &rxmac->sa_hi);
/* Disable all Packet Filtering */ /* Disable all Packet Filtering */

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

@@ -132,7 +132,7 @@ int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)
{ {
struct phy_device *phydev = adapter->phydev; struct phy_device *phydev = adapter->phydev;
if(!phydev) if (!phydev)
return -EIO; return -EIO;
return et131x_phy_mii_read(adapter, phydev->addr, reg, value); return et131x_phy_mii_read(adapter, phydev->addr, reg, value);
@@ -224,7 +224,7 @@ int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)
u32 mii_cmd; u32 mii_cmd;
u32 mii_indicator; u32 mii_indicator;
if(!phydev) if (!phydev)
return -EIO; return -EIO;
addr = phydev->addr; addr = phydev->addr;
@@ -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_ */

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

@@ -435,7 +435,7 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)
add_10bit(&adapter->tx_ring.send_idx, thiscopy); add_10bit(&adapter->tx_ring.send_idx, thiscopy);
if (INDEX10(adapter->tx_ring.send_idx) == 0 || if (INDEX10(adapter->tx_ring.send_idx) == 0 ||
INDEX10(adapter->tx_ring.send_idx) == NUM_DESC_PER_RING_TX) { INDEX10(adapter->tx_ring.send_idx) == NUM_DESC_PER_RING_TX) {
adapter->tx_ring.send_idx &= ~ET_DMA10_MASK; adapter->tx_ring.send_idx &= ~ET_DMA10_MASK;
adapter->tx_ring.send_idx ^= ET_DMA10_WRAP; adapter->tx_ring.send_idx ^= ET_DMA10_WRAP;
} }
@@ -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,

8
drivers/staging/et131x/et131x_ethtool.c
View File

@@ -58,10 +58,10 @@ static void et131x_get_drvinfo(struct net_device *netdev,
} }
static struct ethtool_ops et131x_ethtool_ops = { static struct ethtool_ops et131x_ethtool_ops = {
.get_settings = et131x_get_settings, .get_settings = et131x_get_settings,
.set_settings = et131x_set_settings, .set_settings = et131x_set_settings,
.get_drvinfo = et131x_get_drvinfo, .get_drvinfo = et131x_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
}; };
void et131x_set_ethtool_ops(struct net_device *netdev) void et131x_set_ethtool_ops(struct net_device *netdev)

44
drivers/staging/et131x/et131x_initpci.c
View File

@@ -487,30 +487,30 @@ int et131x_mii_probe(struct net_device *netdev)
phydev = phy_connect(netdev, dev_name(&phydev->dev), phydev = phy_connect(netdev, dev_name(&phydev->dev),
&et131x_adjust_link, 0, PHY_INTERFACE_MODE_MII); &et131x_adjust_link, 0, PHY_INTERFACE_MODE_MII);
if(IS_ERR(phydev)) { if (IS_ERR(phydev)) {
dev_err(&adapter->pdev->dev, "Could not attach to PHY\n"); dev_err(&adapter->pdev->dev, "Could not attach to PHY\n");
return PTR_ERR(phydev); return PTR_ERR(phydev);
} }
phydev->supported &= (SUPPORTED_10baseT_Half phydev->supported &= (SUPPORTED_10baseT_Half
| SUPPORTED_10baseT_Full | SUPPORTED_10baseT_Full
| SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Half
| SUPPORTED_100baseT_Full | SUPPORTED_100baseT_Full
| SUPPORTED_Autoneg | SUPPORTED_Autoneg
| SUPPORTED_MII | SUPPORTED_MII
| SUPPORTED_TP); | SUPPORTED_TP);
if (adapter->pdev->device != ET131X_PCI_DEVICE_ID_FAST) if (adapter->pdev->device != ET131X_PCI_DEVICE_ID_FAST)
phydev->supported |= SUPPORTED_1000baseT_Full; phydev->supported |= SUPPORTED_1000baseT_Full;
phydev->advertising = phydev->supported; phydev->advertising = phydev->supported;
adapter->phydev = phydev; adapter->phydev = phydev;
dev_info(&adapter->pdev->dev, "attached PHY driver [%s] " dev_info(&adapter->pdev->dev, "attached PHY driver [%s] "
"(mii_bus:phy_addr=%s)\n", "(mii_bus:phy_addr=%s)\n",
phydev->drv->name, dev_name(&phydev->dev)); phydev->drv->name, dev_name(&phydev->dev));
return 0; return 0;
} }
/** /**
@@ -707,22 +707,22 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
adapter->mii_bus->write = et131x_mdio_write; adapter->mii_bus->write = et131x_mdio_write;
adapter->mii_bus->reset = et131x_mdio_reset; adapter->mii_bus->reset = et131x_mdio_reset;
adapter->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); adapter->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
if (!adapter->mii_bus->irq) { if (!adapter->mii_bus->irq) {
dev_err(&pdev->dev, "mii_bus irq allocation failed\n"); dev_err(&pdev->dev, "mii_bus irq allocation failed\n");
goto err_mdio_free; goto err_mdio_free;
} }
for (ii = 0; ii < PHY_MAX_ADDR; ii++) for (ii = 0; ii < PHY_MAX_ADDR; ii++)
adapter->mii_bus->irq[ii] = PHY_POLL; adapter->mii_bus->irq[ii] = PHY_POLL;
if (mdiobus_register(adapter->mii_bus)) { if (mdiobus_register(adapter->mii_bus)) {
dev_err(&pdev->dev, "failed to register MII bus\n"); dev_err(&pdev->dev, "failed to register MII bus\n");
mdiobus_free(adapter->mii_bus); mdiobus_free(adapter->mii_bus);
goto err_mdio_free_irq; goto err_mdio_free_irq;
} }
if (et131x_mii_probe(netdev)) { if (et131x_mii_probe(netdev)) {
dev_err(&pdev->dev, "failed to probe MII bus\n"); dev_err(&pdev->dev, "failed to probe MII bus\n");
goto err_mdio_unregister; goto err_mdio_unregister;
} }

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);