@@ -356,8 +356,7 @@ static void ixp_tx_timestamp(struct port *port, struct sk_buff *skb)
regs = port->timesync_regs;
- /*
- * This really stinks, but we have to poll for the Tx time stamp.
+ /* This really stinks, but we have to poll for the Tx time stamp.
* Usually, the time stamp is ready after 4 to 6 microseconds.
*/
for (cnt = 0; cnt < 100; cnt++) {
@@ -653,7 +652,8 @@ static inline void queue_put_desc(unsigned int queue, u32 phys,
BUG_ON(phys & 0x1F);
qmgr_put_entry(queue, phys);
/* Don't check for queue overflow here, we've allocated sufficient
- length and queues >= 32 don't support this check anyway. */
+ * length and queues >= 32 don't support this check anyway.
+ */
}
static inline void dma_unmap_tx(struct port *port, struct desc *desc)
@@ -893,7 +893,8 @@ static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
port->tx_buff_tab[n] = mem;
#endif
desc->data = phys + offset;
- desc->buf_len = desc->pkt_len = len;
+ desc->buf_len = len;
+ desc->pkt_len = len;
/* NPE firmware pads short frames with zeros internally */
wmb();
@@ -941,7 +942,7 @@ static void eth_set_mcast_list(struct net_device *dev)
__raw_writel(allmulti[i], &port->regs->mcast_mask[i]);
}
__raw_writel(DEFAULT_RX_CNTRL0 | RX_CNTRL0_ADDR_FLTR_EN,
- &port->regs->rx_control[0]);
+ &port->regs->rx_control[0]);
return;
}
@@ -1321,7 +1322,8 @@ static int eth_close(struct net_device *dev)
BUG_ON(n < 0);
desc = tx_desc_ptr(port, n);
phys = tx_desc_phys(port, n);
- desc->buf_len = desc->pkt_len = 1;
+ desc->buf_len = 1;
+ desc->pkt_len = 1;
wmb();
queue_put_desc(TX_QUEUE(port->id), phys, desc);
}
Fix all easy remaining styles issues. Signed-off-by: Corentin Labbe <clabbe@baylibre.com> --- drivers/net/ethernet/xscale/ixp4xx_eth.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)