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/atarilance.c | |
parent | 7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff) |
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/atarilance.c')
-rw-r--r-- | drivers/net/atarilance.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 465efe7a6c56..b6570ca6ada7 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
@@ -356,7 +356,7 @@ static void lance_tx_timeout (struct net_device *dev); | |||
356 | 356 | ||
357 | 357 | ||
358 | 358 | ||
359 | 359 | ||
360 | 360 | ||
361 | static void *slow_memcpy( void *dst, const void *src, size_t len ) | 361 | static void *slow_memcpy( void *dst, const void *src, size_t len ) |
362 | 362 | ||
@@ -549,7 +549,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, | |||
549 | memaddr == (unsigned short *)0xffe00000) { | 549 | memaddr == (unsigned short *)0xffe00000) { |
550 | /* PAMs card and Riebl on ST use level 5 autovector */ | 550 | /* PAMs card and Riebl on ST use level 5 autovector */ |
551 | if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, | 551 | if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, |
552 | "PAM/Riebl-ST Ethernet", dev)) { | 552 | "PAM/Riebl-ST Ethernet", dev)) { |
553 | printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); | 553 | printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); |
554 | return( 0 ); | 554 | return( 0 ); |
555 | } | 555 | } |
@@ -639,7 +639,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, | |||
639 | /* XXX MSch */ | 639 | /* XXX MSch */ |
640 | dev->tx_timeout = lance_tx_timeout; | 640 | dev->tx_timeout = lance_tx_timeout; |
641 | dev->watchdog_timeo = TX_TIMEOUT; | 641 | dev->watchdog_timeo = TX_TIMEOUT; |
642 | 642 | ||
643 | 643 | ||
644 | #if 0 | 644 | #if 0 |
645 | dev->start = 0; | 645 | dev->start = 0; |
@@ -650,7 +650,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, | |||
650 | return( 1 ); | 650 | return( 1 ); |
651 | } | 651 | } |
652 | 652 | ||
653 | 653 | ||
654 | static int lance_open( struct net_device *dev ) | 654 | static int lance_open( struct net_device *dev ) |
655 | 655 | ||
656 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 656 | { struct lance_private *lp = (struct lance_private *)dev->priv; |
@@ -744,7 +744,7 @@ static void lance_tx_timeout (struct net_device *dev) | |||
744 | { | 744 | { |
745 | struct lance_private *lp = (struct lance_private *) dev->priv; | 745 | struct lance_private *lp = (struct lance_private *) dev->priv; |
746 | struct lance_ioreg *IO = lp->iobase; | 746 | struct lance_ioreg *IO = lp->iobase; |
747 | 747 | ||
748 | AREG = CSR0; | 748 | AREG = CSR0; |
749 | DPRINTK( 1, ( "%s: transmit timed out, status %04x, resetting.\n", | 749 | DPRINTK( 1, ( "%s: transmit timed out, status %04x, resetting.\n", |
750 | dev->name, DREG )); | 750 | dev->name, DREG )); |
@@ -772,7 +772,7 @@ static void lance_tx_timeout (struct net_device *dev) | |||
772 | -MEM->tx_head[i].length, | 772 | -MEM->tx_head[i].length, |
773 | MEM->tx_head[i].misc )); | 773 | MEM->tx_head[i].misc )); |
774 | } | 774 | } |
775 | #endif | 775 | #endif |
776 | /* XXX MSch: maybe purge/reinit ring here */ | 776 | /* XXX MSch: maybe purge/reinit ring here */ |
777 | /* lance_restart, essentially */ | 777 | /* lance_restart, essentially */ |
778 | lance_init_ring(dev); | 778 | lance_init_ring(dev); |
@@ -802,12 +802,12 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
802 | /* PAM-Card has a bug: Can only send packets with even number of bytes! */ | 802 | /* PAM-Card has a bug: Can only send packets with even number of bytes! */ |
803 | else if (lp->cardtype == PAM_CARD && (len & 1)) | 803 | else if (lp->cardtype == PAM_CARD && (len & 1)) |
804 | ++len; | 804 | ++len; |
805 | 805 | ||
806 | if (len > skb->len) { | 806 | if (len > skb->len) { |
807 | if (skb_padto(skb, len)) | 807 | if (skb_padto(skb, len)) |
808 | return 0; | 808 | return 0; |
809 | } | 809 | } |
810 | 810 | ||
811 | netif_stop_queue (dev); | 811 | netif_stop_queue (dev); |
812 | 812 | ||
813 | /* Fill in a Tx ring entry */ | 813 | /* Fill in a Tx ring entry */ |
@@ -1175,7 +1175,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr ) | |||
1175 | return( 0 ); | 1175 | return( 0 ); |
1176 | } | 1176 | } |
1177 | 1177 | ||
1178 | 1178 | ||
1179 | #ifdef MODULE | 1179 | #ifdef MODULE |
1180 | static struct net_device *atarilance_dev; | 1180 | static struct net_device *atarilance_dev; |
1181 | 1181 | ||
@@ -1195,7 +1195,7 @@ void cleanup_module(void) | |||
1195 | } | 1195 | } |
1196 | 1196 | ||
1197 | #endif /* MODULE */ | 1197 | #endif /* MODULE */ |
1198 | 1198 | ||
1199 | 1199 | ||
1200 | /* | 1200 | /* |
1201 | * Local variables: | 1201 | * Local variables: |