aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c523.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/3c523.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/3c523.c')
-rw-r--r--drivers/net/3c523.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 5dfd97f0ba9e..3364eb4aff1e 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -83,7 +83,7 @@
83 Stuart Adamson <stuart.adamson@compsoc.net> 83 Stuart Adamson <stuart.adamson@compsoc.net>
84 Nov 2001 84 Nov 2001
85 added support for ethtool (jgarzik) 85 added support for ethtool (jgarzik)
86 86
87 $Header: /fsys2/home/chrisb/linux-1.3.59-MCA/drivers/net/RCS/3c523.c,v 1.1 1996/02/05 01:53:46 chrisb Exp chrisb $ 87 $Header: /fsys2/home/chrisb/linux-1.3.59-MCA/drivers/net/RCS/3c523.c,v 1.1 1996/02/05 01:53:46 chrisb Exp chrisb $
88 */ 88 */
89 89
@@ -434,14 +434,14 @@ static int __init do_elmc_probe(struct net_device *dev)
434 434
435 dev->irq=irq_table[(status & ELMC_STATUS_IRQ_SELECT) >> 6]; 435 dev->irq=irq_table[(status & ELMC_STATUS_IRQ_SELECT) >> 6];
436 dev->base_addr=csr_table[(status & ELMC_STATUS_CSR_SELECT) >> 1]; 436 dev->base_addr=csr_table[(status & ELMC_STATUS_CSR_SELECT) >> 1];
437 437
438 /* 438 /*
439 If we're trying to match a specified irq or IO address, 439 If we're trying to match a specified irq or IO address,
440 we'll reject a match unless it's what we're looking for. 440 we'll reject a match unless it's what we're looking for.
441 Also reject it if the card is already in use. 441 Also reject it if the card is already in use.
442 */ 442 */
443 443
444 if ((irq && irq != dev->irq) || 444 if ((irq && irq != dev->irq) ||
445 (base_addr && base_addr != dev->base_addr)) { 445 (base_addr && base_addr != dev->base_addr)) {
446 slot = mca_find_adapter(ELMC_MCA_ID, slot + 1); 446 slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
447 continue; 447 continue;
@@ -540,7 +540,7 @@ static int __init do_elmc_probe(struct net_device *dev)
540 540
541 /* dump all the assorted information */ 541 /* dump all the assorted information */
542 printk(KERN_INFO "%s: IRQ %d, %sternal xcvr, memory %#lx-%#lx.\n", dev->name, 542 printk(KERN_INFO "%s: IRQ %d, %sternal xcvr, memory %#lx-%#lx.\n", dev->name,
543 dev->irq, dev->if_port ? "ex" : "in", 543 dev->irq, dev->if_port ? "ex" : "in",
544 dev->mem_start, dev->mem_end - 1); 544 dev->mem_start, dev->mem_end - 1);
545 545
546 /* The hardware address for the 3c523 is stored in the first six 546 /* The hardware address for the 3c523 is stored in the first six
@@ -564,7 +564,7 @@ static int __init do_elmc_probe(struct net_device *dev)
564 dev->set_multicast_list = NULL; 564 dev->set_multicast_list = NULL;
565#endif 565#endif
566 dev->ethtool_ops = &netdev_ethtool_ops; 566 dev->ethtool_ops = &netdev_ethtool_ops;
567 567
568 /* note that we haven't actually requested the IRQ from the kernel. 568 /* note that we haven't actually requested the IRQ from the kernel.
569 That gets done in elmc_open(). I'm not sure that's such a good idea, 569 That gets done in elmc_open(). I'm not sure that's such a good idea,
570 but it works, so I'll go with it. */ 570 but it works, so I'll go with it. */
@@ -583,7 +583,7 @@ err_out:
583 release_region(dev->base_addr, ELMC_IO_EXTENT); 583 release_region(dev->base_addr, ELMC_IO_EXTENT);
584 return retval; 584 return retval;
585} 585}
586 586
587static void cleanup_card(struct net_device *dev) 587static void cleanup_card(struct net_device *dev)
588{ 588{
589 mca_set_adapter_procfn(((struct priv *) (dev->priv))->slot, NULL, NULL); 589 mca_set_adapter_procfn(((struct priv *) (dev->priv))->slot, NULL, NULL);
@@ -926,7 +926,7 @@ elmc_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
926 926
927 p = (struct priv *) dev->priv; 927 p = (struct priv *) dev->priv;
928 928
929 while ((stat = p->scb->status & STAT_MASK)) 929 while ((stat = p->scb->status & STAT_MASK))
930 { 930 {
931 p->scb->cmd = stat; 931 p->scb->cmd = stat;
932 elmc_attn586(); /* ack inter. */ 932 elmc_attn586(); /* ack inter. */
@@ -1102,7 +1102,7 @@ static void startrecv586(struct net_device *dev)
1102/****************************************************** 1102/******************************************************
1103 * timeout 1103 * timeout
1104 */ 1104 */
1105 1105
1106static void elmc_timeout(struct net_device *dev) 1106static void elmc_timeout(struct net_device *dev)
1107{ 1107{
1108 struct priv *p = (struct priv *) dev->priv; 1108 struct priv *p = (struct priv *) dev->priv;
@@ -1129,7 +1129,7 @@ static void elmc_timeout(struct net_device *dev)
1129 elmc_open(dev); 1129 elmc_open(dev);
1130 } 1130 }
1131} 1131}
1132 1132
1133/****************************************************** 1133/******************************************************
1134 * send frame 1134 * send frame
1135 */ 1135 */
@@ -1146,7 +1146,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev)
1146 netif_stop_queue(dev); 1146 netif_stop_queue(dev);
1147 1147
1148 len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN; 1148 len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
1149 1149
1150 if (len != skb->len) 1150 if (len != skb->len)
1151 memset((char *) p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN); 1151 memset((char *) p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
1152 memcpy((char *) p->xmit_cbuffs[p->xmit_count], (char *) (skb->data), skb->len); 1152 memcpy((char *) p->xmit_cbuffs[p->xmit_count], (char *) (skb->data), skb->len);
@@ -1177,7 +1177,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev)
1177#else 1177#else
1178 next_nop = (p->nop_point + 1) & 0x1; 1178 next_nop = (p->nop_point + 1) & 0x1;
1179 p->xmit_buffs[0]->size = TBD_LAST | len; 1179 p->xmit_buffs[0]->size = TBD_LAST | len;
1180 1180
1181 p->xmit_cmds[0]->cmd_link = p->nop_cmds[next_nop]->cmd_link 1181 p->xmit_cmds[0]->cmd_link = p->nop_cmds[next_nop]->cmd_link
1182 = make16((p->nop_cmds[next_nop])); 1182 = make16((p->nop_cmds[next_nop]));
1183 p->xmit_cmds[0]->cmd_status = p->nop_cmds[next_nop]->cmd_status = 0; 1183 p->xmit_cmds[0]->cmd_status = p->nop_cmds[next_nop]->cmd_status = 0;
@@ -1281,7 +1281,7 @@ int __init init_module(void)
1281{ 1281{
1282 int this_dev,found = 0; 1282 int this_dev,found = 0;
1283 1283
1284 /* Loop until we either can't find any more cards, or we have MAX_3C523_CARDS */ 1284 /* Loop until we either can't find any more cards, or we have MAX_3C523_CARDS */
1285 for(this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) { 1285 for(this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {
1286 struct net_device *dev = alloc_etherdev(sizeof(struct priv)); 1286 struct net_device *dev = alloc_etherdev(sizeof(struct priv));
1287 if (!dev) 1287 if (!dev)