diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 13:24:59 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 13:24:59 -0400 |
commit | 6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch) | |
tree | df0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/meth.c | |
parent | 7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff) |
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/meth.c')
-rw-r--r-- | drivers/net/meth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index d644bf3a933c..55b1495a70d6 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
@@ -93,7 +93,7 @@ struct meth_private { | |||
93 | 93 | ||
94 | static void meth_tx_timeout(struct net_device *dev); | 94 | static void meth_tx_timeout(struct net_device *dev); |
95 | static irqreturn_t meth_interrupt(int irq, void *dev_id, struct pt_regs *pregs); | 95 | static irqreturn_t meth_interrupt(int irq, void *dev_id, struct pt_regs *pregs); |
96 | 96 | ||
97 | /* global, initialized in ip32-setup.c */ | 97 | /* global, initialized in ip32-setup.c */ |
98 | char o2meth_eaddr[8]={0,0,0,0,0,0,0,0}; | 98 | char o2meth_eaddr[8]={0,0,0,0,0,0,0,0}; |
99 | 99 | ||
@@ -232,7 +232,7 @@ static int meth_init_rx_ring(struct meth_private *priv) | |||
232 | skb_reserve(priv->rx_skbs[i],METH_RX_HEAD); | 232 | skb_reserve(priv->rx_skbs[i],METH_RX_HEAD); |
233 | priv->rx_ring[i]=(rx_packet*)(priv->rx_skbs[i]->head); | 233 | priv->rx_ring[i]=(rx_packet*)(priv->rx_skbs[i]->head); |
234 | /* I'll need to re-sync it after each RX */ | 234 | /* I'll need to re-sync it after each RX */ |
235 | priv->rx_ring_dmas[i] = | 235 | priv->rx_ring_dmas[i] = |
236 | dma_map_single(NULL, priv->rx_ring[i], | 236 | dma_map_single(NULL, priv->rx_ring[i], |
237 | METH_RX_BUFF_SIZE, DMA_FROM_DEVICE); | 237 | METH_RX_BUFF_SIZE, DMA_FROM_DEVICE); |
238 | mace->eth.rx_fifo = priv->rx_ring_dmas[i]; | 238 | mace->eth.rx_fifo = priv->rx_ring_dmas[i]; |
@@ -281,7 +281,7 @@ int meth_reset(struct net_device *dev) | |||
281 | /* Load ethernet address */ | 281 | /* Load ethernet address */ |
282 | load_eaddr(dev); | 282 | load_eaddr(dev); |
283 | /* Should load some "errata", but later */ | 283 | /* Should load some "errata", but later */ |
284 | 284 | ||
285 | /* Check for device */ | 285 | /* Check for device */ |
286 | if (mdio_probe(priv) < 0) { | 286 | if (mdio_probe(priv) < 0) { |
287 | DPRINTK("Unable to find PHY\n"); | 287 | DPRINTK("Unable to find PHY\n"); |
@@ -452,7 +452,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status) | |||
452 | } | 452 | } |
453 | priv->rx_ring[priv->rx_write] = (rx_packet*)skb->head; | 453 | priv->rx_ring[priv->rx_write] = (rx_packet*)skb->head; |
454 | priv->rx_ring[priv->rx_write]->status.raw = 0; | 454 | priv->rx_ring[priv->rx_write]->status.raw = 0; |
455 | priv->rx_ring_dmas[priv->rx_write] = | 455 | priv->rx_ring_dmas[priv->rx_write] = |
456 | dma_map_single(NULL, priv->rx_ring[priv->rx_write], | 456 | dma_map_single(NULL, priv->rx_ring[priv->rx_write], |
457 | METH_RX_BUFF_SIZE, DMA_FROM_DEVICE); | 457 | METH_RX_BUFF_SIZE, DMA_FROM_DEVICE); |
458 | mace->eth.rx_fifo = priv->rx_ring_dmas[priv->rx_write]; | 458 | mace->eth.rx_fifo = priv->rx_ring_dmas[priv->rx_write]; |
@@ -555,7 +555,7 @@ static void meth_error(struct net_device* dev, unsigned status) | |||
555 | printk(KERN_WARNING "meth: Rx underflow\n"); | 555 | printk(KERN_WARNING "meth: Rx underflow\n"); |
556 | spin_lock(&priv->meth_lock); | 556 | spin_lock(&priv->meth_lock); |
557 | mace->eth.int_stat = METH_INT_RX_UNDERFLOW; | 557 | mace->eth.int_stat = METH_INT_RX_UNDERFLOW; |
558 | /* more underflow interrupts will be delivered, | 558 | /* more underflow interrupts will be delivered, |
559 | * effectively throwing us into an infinite loop. | 559 | * effectively throwing us into an infinite loop. |
560 | * Thus I stop processing Rx in this case. */ | 560 | * Thus I stop processing Rx in this case. */ |
561 | priv->dma_ctrl &= ~METH_DMA_RX_EN; | 561 | priv->dma_ctrl &= ~METH_DMA_RX_EN; |
@@ -761,12 +761,12 @@ static void meth_tx_timeout(struct net_device *dev) | |||
761 | } | 761 | } |
762 | 762 | ||
763 | /* | 763 | /* |
764 | * Ioctl commands | 764 | * Ioctl commands |
765 | */ | 765 | */ |
766 | static int meth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | 766 | static int meth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) |
767 | { | 767 | { |
768 | /* XXX Not yet implemented */ | 768 | /* XXX Not yet implemented */ |
769 | switch(cmd) { | 769 | switch(cmd) { |
770 | case SIOCGMIIPHY: | 770 | case SIOCGMIIPHY: |
771 | case SIOCGMIIREG: | 771 | case SIOCGMIIREG: |
772 | case SIOCSMIIREG: | 772 | case SIOCSMIIREG: |