aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/at1700.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/at1700.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/at1700.c')
-rw-r--r--drivers/net/at1700.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 1a85451dcb41..4aeca11f3ee2 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -18,7 +18,7 @@
18 straight-forward Fujitsu MB86965 implementations. 18 straight-forward Fujitsu MB86965 implementations.
19 19
20 Modification for Fujitsu FMV-18X cards is done by Yutaka Tamiya 20 Modification for Fujitsu FMV-18X cards is done by Yutaka Tamiya
21 (tamy@flab.fujitsu.co.jp). 21 (tamy@flab.fujitsu.co.jp).
22 22
23 Sources: 23 Sources:
24 The Fujitsu MB86965 datasheet. 24 The Fujitsu MB86965 datasheet.
@@ -168,7 +168,7 @@ static struct net_device_stats *net_get_stats(struct net_device *dev);
168static void set_rx_mode(struct net_device *dev); 168static void set_rx_mode(struct net_device *dev);
169static void net_tx_timeout (struct net_device *dev); 169static void net_tx_timeout (struct net_device *dev);
170 170
171 171
172#ifdef CONFIG_MCA_LEGACY 172#ifdef CONFIG_MCA_LEGACY
173struct at1720_mca_adapters_struct { 173struct at1720_mca_adapters_struct {
174 char* name; 174 char* name;
@@ -201,7 +201,7 @@ static void cleanup_card(struct net_device *dev)
201 struct net_local *lp = netdev_priv(dev); 201 struct net_local *lp = netdev_priv(dev);
202 if (lp->mca_slot >= 0) 202 if (lp->mca_slot >= 0)
203 mca_mark_as_unused(lp->mca_slot); 203 mca_mark_as_unused(lp->mca_slot);
204#endif 204#endif
205 free_irq(dev->irq, NULL); 205 free_irq(dev->irq, NULL);
206 release_region(dev->base_addr, AT1700_IO_EXTENT); 206 release_region(dev->base_addr, AT1700_IO_EXTENT);
207} 207}
@@ -301,7 +301,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
301 for (j = 0; at1720_mca_adapters[j].name != NULL; j ++) { 301 for (j = 0; at1720_mca_adapters[j].name != NULL; j ++) {
302 slot = 0; 302 slot = 0;
303 while (slot != MCA_NOTFOUND) { 303 while (slot != MCA_NOTFOUND) {
304 304
305 slot = mca_find_unused_adapter( at1720_mca_adapters[j].id, slot ); 305 slot = mca_find_unused_adapter( at1720_mca_adapters[j].id, slot );
306 if (slot == MCA_NOTFOUND) break; 306 if (slot == MCA_NOTFOUND) break;
307 307
@@ -315,7 +315,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
315 if (( pos3 & 0x07) == at1700_ioaddr_pattern[l_i]) 315 if (( pos3 & 0x07) == at1700_ioaddr_pattern[l_i])
316 break; 316 break;
317 ioaddr = at1700_mca_probe_list[l_i]; 317 ioaddr = at1700_mca_probe_list[l_i];
318 318
319 for (irq = 0; irq < 0x10; irq++) 319 for (irq = 0; irq < 0x10; irq++)
320 if (((((pos4>>4) & 0x0f) | (pos3 & 0xf0)) & 0xff) == at1700_irq_pattern[irq]) 320 if (((((pos4>>4) & 0x0f) | (pos3 & 0xf0)) & 0xff) == at1700_irq_pattern[irq])
321 break; 321 break;
@@ -328,7 +328,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
328 } 328 }
329 329
330 dev->irq = irq; 330 dev->irq = irq;
331 331
332 /* claim the slot */ 332 /* claim the slot */
333 mca_set_adapter_name( slot, at1720_mca_adapters[j].name ); 333 mca_set_adapter_name( slot, at1720_mca_adapters[j].name );
334 mca_mark_as_used(slot); 334 mca_mark_as_used(slot);
@@ -353,7 +353,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
353 else { 353 else {
354 goto err_out; 354 goto err_out;
355 } 355 }
356 356
357#ifdef CONFIG_MCA_LEGACY 357#ifdef CONFIG_MCA_LEGACY
358found: 358found:
359#endif 359#endif
@@ -487,7 +487,7 @@ err_out:
487 return ret; 487 return ret;
488} 488}
489 489
490 490
491/* EEPROM_Ctrl bits. */ 491/* EEPROM_Ctrl bits. */
492#define EE_SHIFT_CLK 0x40 /* EEPROM shift clock, in reg. 16. */ 492#define EE_SHIFT_CLK 0x40 /* EEPROM shift clock, in reg. 16. */
493#define EE_CS 0x20 /* EEPROM chip select, in reg. 16. */ 493#define EE_CS 0x20 /* EEPROM chip select, in reg. 16. */
@@ -528,7 +528,7 @@ static int __init read_eeprom(long ioaddr, int location)
528 return retval; 528 return retval;
529} 529}
530 530
531 531
532 532
533static int net_open(struct net_device *dev) 533static int net_open(struct net_device *dev)
534{ 534{
@@ -645,7 +645,7 @@ static int net_send_packet (struct sk_buff *skb, struct net_device *dev)
645 645
646 return 0; 646 return 0;
647} 647}
648 648
649/* The typical workload of the driver: 649/* The typical workload of the driver:
650 Handle the network interface interrupts. */ 650 Handle the network interface interrupts. */
651static irqreturn_t 651static irqreturn_t
@@ -663,9 +663,9 @@ net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
663 663
664 ioaddr = dev->base_addr; 664 ioaddr = dev->base_addr;
665 lp = netdev_priv(dev); 665 lp = netdev_priv(dev);
666 666
667 spin_lock (&lp->lock); 667 spin_lock (&lp->lock);
668 668
669 status = inw(ioaddr + TX_STATUS); 669 status = inw(ioaddr + TX_STATUS);
670 outw(status, ioaddr + TX_STATUS); 670 outw(status, ioaddr + TX_STATUS);
671 671
@@ -919,7 +919,7 @@ cleanup_module(void)
919#endif /* MODULE */ 919#endif /* MODULE */
920MODULE_LICENSE("GPL"); 920MODULE_LICENSE("GPL");
921 921
922 922
923/* 923/*
924 * Local variables: 924 * Local variables:
925 * compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -c at1700.c" 925 * compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -c at1700.c"