aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mac89x0.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
commit6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch)
treedf0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/mac89x0.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/mac89x0.c')
-rw-r--r--drivers/net/mac89x0.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index cd3c9a5a98b2..8472b71641da 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -12,24 +12,24 @@
12 Changelog: 12 Changelog:
13 13
14 Mike Cruse : mcruse@cti-ltd.com 14 Mike Cruse : mcruse@cti-ltd.com
15 : Changes for Linux 2.0 compatibility. 15 : Changes for Linux 2.0 compatibility.
16 : Added dev_id parameter in net_interrupt(), 16 : Added dev_id parameter in net_interrupt(),
17 : request_irq() and free_irq(). Just NULL for now. 17 : request_irq() and free_irq(). Just NULL for now.
18 18
19 Mike Cruse : Added MOD_INC_USE_COUNT and MOD_DEC_USE_COUNT macros 19 Mike Cruse : Added MOD_INC_USE_COUNT and MOD_DEC_USE_COUNT macros
20 : in net_open() and net_close() so kerneld would know 20 : in net_open() and net_close() so kerneld would know
21 : that the module is in use and wouldn't eject the 21 : that the module is in use and wouldn't eject the
22 : driver prematurely. 22 : driver prematurely.
23 23
24 Mike Cruse : Rewrote init_module() and cleanup_module using 8390.c 24 Mike Cruse : Rewrote init_module() and cleanup_module using 8390.c
25 : as an example. Disabled autoprobing in init_module(), 25 : as an example. Disabled autoprobing in init_module(),
26 : not a good thing to do to other devices while Linux 26 : not a good thing to do to other devices while Linux
27 : is running from all accounts. 27 : is running from all accounts.
28 28
29 Alan Cox : Removed 1.2 support, added 2.1 extra counters. 29 Alan Cox : Removed 1.2 support, added 2.1 extra counters.
30 30
31 David Huggins-Daines <dhd@debian.org> 31 David Huggins-Daines <dhd@debian.org>
32 32
33 Split this off into mac89x0.c, and gutted it of all parts which are 33 Split this off into mac89x0.c, and gutted it of all parts which are
34 not relevant to the existing CS8900 cards on the Macintosh 34 not relevant to the existing CS8900 cards on the Macintosh
35 (i.e. basically the Daynaport CS and LC cards). To be precise: 35 (i.e. basically the Daynaport CS and LC cards). To be precise:
@@ -210,7 +210,7 @@ struct net_device * __init mac89x0_probe(int unit)
210 { 210 {
211 unsigned long flags; 211 unsigned long flags;
212 int card_present; 212 int card_present;
213 213
214 local_irq_save(flags); 214 local_irq_save(flags);
215 card_present = hwreg_present((void*) ioaddr+4) 215 card_present = hwreg_present((void*) ioaddr+4)
216 && hwreg_present((void*) ioaddr + DATA_PORT); 216 && hwreg_present((void*) ioaddr + DATA_PORT);
@@ -230,7 +230,7 @@ struct net_device * __init mac89x0_probe(int unit)
230 230
231 /* Fill in the 'dev' fields. */ 231 /* Fill in the 'dev' fields. */
232 dev->base_addr = ioaddr; 232 dev->base_addr = ioaddr;
233 dev->mem_start = (unsigned long) 233 dev->mem_start = (unsigned long)
234 nubus_slot_addr(slot) | (((slot&0xf) << 20) + MMIOBASE); 234 nubus_slot_addr(slot) | (((slot&0xf) << 20) + MMIOBASE);
235 dev->mem_end = dev->mem_start + 0x1000; 235 dev->mem_end = dev->mem_start + 0x1000;
236 236
@@ -428,7 +428,7 @@ net_send_packet(struct sk_buff *skb, struct net_device *dev)
428 428
429 return 0; 429 return 0;
430} 430}
431 431
432/* The typical workload of the driver: 432/* The typical workload of the driver:
433 Handle the network interface interrupts. */ 433 Handle the network interface interrupts. */
434static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs * regs) 434static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs * regs)
@@ -596,7 +596,7 @@ static void set_multicast_list(struct net_device *dev)
596 /* The multicast-accept list is initialized to accept-all, and we 596 /* The multicast-accept list is initialized to accept-all, and we
597 rely on higher-level filtering for now. */ 597 rely on higher-level filtering for now. */
598 lp->rx_mode = RX_MULTCAST_ACCEPT; 598 lp->rx_mode = RX_MULTCAST_ACCEPT;
599 } 599 }
600 else 600 else
601 lp->rx_mode = 0; 601 lp->rx_mode = 0;
602 602
@@ -653,7 +653,7 @@ cleanup_module(void)
653 free_netdev(dev_cs89x0); 653 free_netdev(dev_cs89x0);
654} 654}
655#endif /* MODULE */ 655#endif /* MODULE */
656 656
657/* 657/*
658 * Local variables: 658 * Local variables:
659 * compile-command: "m68k-linux-gcc -D__KERNEL__ -I../../include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -ffixed-a2 -DMODULE -DMODVERSIONS -include ../../include/linux/modversions.h -c -o mac89x0.o mac89x0.c" 659 * compile-command: "m68k-linux-gcc -D__KERNEL__ -I../../include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -ffixed-a2 -DMODULE -DMODVERSIONS -include ../../include/linux/modversions.h -c -o mac89x0.o mac89x0.c"