aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fec.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-01-19 14:26:39 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-02-15 03:26:30 -0500
commitdb8880bc92657559320ba8384acb2547d4255521 (patch)
treeba825e59003ee189d42303081f8336b4ea68876e /drivers/net/fec.c
parentc556167f819160e157b4d73937885de8754ea53c (diff)
net/fec: some whitespace cleanup
A few of these were found and reported by Lothar Waßmann. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'drivers/net/fec.c')
-rw-r--r--drivers/net/fec.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index c70503a065b..4c888f1825a 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -182,7 +182,7 @@ struct fec_enet_private {
182 struct bufdesc *rx_bd_base; 182 struct bufdesc *rx_bd_base;
183 struct bufdesc *tx_bd_base; 183 struct bufdesc *tx_bd_base;
184 /* The next free ring entry */ 184 /* The next free ring entry */
185 struct bufdesc *cur_rx, *cur_tx; 185 struct bufdesc *cur_rx, *cur_tx;
186 /* The ring entries to be free()ed */ 186 /* The ring entries to be free()ed */
187 struct bufdesc *dirty_tx; 187 struct bufdesc *dirty_tx;
188 188
@@ -190,15 +190,15 @@ struct fec_enet_private {
190 /* hold while accessing the HW like ringbuffer for tx/rx but not MAC */ 190 /* hold while accessing the HW like ringbuffer for tx/rx but not MAC */
191 spinlock_t hw_lock; 191 spinlock_t hw_lock;
192 192
193 struct platform_device *pdev; 193 struct platform_device *pdev;
194 194
195 int opened; 195 int opened;
196 196
197 /* Phylib and MDIO interface */ 197 /* Phylib and MDIO interface */
198 struct mii_bus *mii_bus; 198 struct mii_bus *mii_bus;
199 struct phy_device *phy_dev; 199 struct phy_device *phy_dev;
200 int mii_timeout; 200 int mii_timeout;
201 uint phy_speed; 201 uint phy_speed;
202 phy_interface_t phy_interface; 202 phy_interface_t phy_interface;
203 int link; 203 int link;
204 int full_duplex; 204 int full_duplex;
@@ -525,8 +525,8 @@ fec_enet_rx(struct net_device *ndev)
525 ndev->stats.rx_bytes += pkt_len; 525 ndev->stats.rx_bytes += pkt_len;
526 data = (__u8*)__va(bdp->cbd_bufaddr); 526 data = (__u8*)__va(bdp->cbd_bufaddr);
527 527
528 dma_unmap_single(NULL, bdp->cbd_bufaddr, bdp->cbd_datlen, 528 dma_unmap_single(NULL, bdp->cbd_bufaddr, bdp->cbd_datlen,
529 DMA_FROM_DEVICE); 529 DMA_FROM_DEVICE);
530 530
531 if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) 531 if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
532 swap_buffer(data, pkt_len); 532 swap_buffer(data, pkt_len);
@@ -550,7 +550,7 @@ fec_enet_rx(struct net_device *ndev)
550 netif_rx(skb); 550 netif_rx(skb);
551 } 551 }
552 552
553 bdp->cbd_bufaddr = dma_map_single(NULL, data, bdp->cbd_datlen, 553 bdp->cbd_bufaddr = dma_map_single(NULL, data, bdp->cbd_datlen,
554 DMA_FROM_DEVICE); 554 DMA_FROM_DEVICE);
555rx_processing_done: 555rx_processing_done:
556 /* Clear the status flags for this buffer */ 556 /* Clear the status flags for this buffer */
@@ -1034,7 +1034,7 @@ fec_enet_close(struct net_device *ndev)
1034 phy_disconnect(fep->phy_dev); 1034 phy_disconnect(fep->phy_dev);
1035 } 1035 }
1036 1036
1037 fec_enet_free_buffers(ndev); 1037 fec_enet_free_buffers(ndev);
1038 1038
1039 return 0; 1039 return 0;
1040} 1040}
@@ -1147,7 +1147,7 @@ static const struct net_device_ops fec_netdev_ops = {
1147 .ndo_validate_addr = eth_validate_addr, 1147 .ndo_validate_addr = eth_validate_addr,
1148 .ndo_tx_timeout = fec_timeout, 1148 .ndo_tx_timeout = fec_timeout,
1149 .ndo_set_mac_address = fec_set_mac_address, 1149 .ndo_set_mac_address = fec_set_mac_address,
1150 .ndo_do_ioctl = fec_enet_ioctl, 1150 .ndo_do_ioctl = fec_enet_ioctl,
1151}; 1151};
1152 1152
1153 /* 1153 /*