aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/rrunner.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/rrunner.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/rrunner.c')
-rw-r--r--drivers/net/rrunner.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 31bcdad54716..6108bac8d56a 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -214,13 +214,13 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
214 214
215 out: 215 out:
216 if (rrpriv->rx_ring) 216 if (rrpriv->rx_ring)
217 pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring, 217 pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring,
218 rrpriv->rx_ring_dma); 218 rrpriv->rx_ring_dma);
219 if (rrpriv->tx_ring) 219 if (rrpriv->tx_ring)
220 pci_free_consistent(pdev, TX_TOTAL_SIZE, rrpriv->tx_ring, 220 pci_free_consistent(pdev, TX_TOTAL_SIZE, rrpriv->tx_ring,
221 rrpriv->tx_ring_dma); 221 rrpriv->tx_ring_dma);
222 if (rrpriv->regs) 222 if (rrpriv->regs)
223 iounmap(rrpriv->regs); 223 iounmap(rrpriv->regs);
224 if (pdev) { 224 if (pdev) {
225 pci_release_regions(pdev); 225 pci_release_regions(pdev);
226 pci_set_drvdata(pdev, NULL); 226 pci_set_drvdata(pdev, NULL);
@@ -559,7 +559,7 @@ static int __init rr_init(struct net_device *dev)
559 htons(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA)); 559 htons(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA));
560 *(u32 *)(dev->dev_addr+2) = 560 *(u32 *)(dev->dev_addr+2) =
561 htonl(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA[4])); 561 htonl(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA[4]));
562 562
563 printk(" MAC: "); 563 printk(" MAC: ");
564 564
565 for (i = 0; i < 5; i++) 565 for (i = 0; i < 5; i++)
@@ -736,8 +736,8 @@ static int rr_init1(struct net_device *dev)
736 struct sk_buff *skb = rrpriv->rx_skbuff[i]; 736 struct sk_buff *skb = rrpriv->rx_skbuff[i];
737 737
738 if (skb) { 738 if (skb) {
739 pci_unmap_single(rrpriv->pci_dev, 739 pci_unmap_single(rrpriv->pci_dev,
740 rrpriv->rx_ring[i].addr.addrlo, 740 rrpriv->rx_ring[i].addr.addrlo,
741 dev->mtu + HIPPI_HLEN, 741 dev->mtu + HIPPI_HLEN,
742 PCI_DMA_FROMDEVICE); 742 PCI_DMA_FROMDEVICE);
743 rrpriv->rx_ring[i].size = 0; 743 rrpriv->rx_ring[i].size = 0;
@@ -792,14 +792,14 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
792 case E_INTERN_ERR: 792 case E_INTERN_ERR:
793 printk(KERN_ERR "%s: HIPPI Internal NIC error\n", 793 printk(KERN_ERR "%s: HIPPI Internal NIC error\n",
794 dev->name); 794 dev->name);
795 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 795 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
796 &regs->HostCtrl); 796 &regs->HostCtrl);
797 wmb(); 797 wmb();
798 break; 798 break;
799 case E_HOST_ERR: 799 case E_HOST_ERR:
800 printk(KERN_ERR "%s: Host software error\n", 800 printk(KERN_ERR "%s: Host software error\n",
801 dev->name); 801 dev->name);
802 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 802 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
803 &regs->HostCtrl); 803 &regs->HostCtrl);
804 wmb(); 804 wmb();
805 break; 805 break;
@@ -823,7 +823,7 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
823 case E_INT_PRTY: 823 case E_INT_PRTY:
824 printk(KERN_ERR "%s: HIPPI Internal Parity error\n", 824 printk(KERN_ERR "%s: HIPPI Internal Parity error\n",
825 dev->name); 825 dev->name);
826 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 826 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
827 &regs->HostCtrl); 827 &regs->HostCtrl);
828 wmb(); 828 wmb();
829 break; 829 break;
@@ -835,28 +835,28 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
835 printk(KERN_WARNING "%s: Link lost during transmit\n", 835 printk(KERN_WARNING "%s: Link lost during transmit\n",
836 dev->name); 836 dev->name);
837 rrpriv->stats.tx_aborted_errors++; 837 rrpriv->stats.tx_aborted_errors++;
838 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 838 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
839 &regs->HostCtrl); 839 &regs->HostCtrl);
840 wmb(); 840 wmb();
841 break; 841 break;
842 case E_TX_INV_RNG: 842 case E_TX_INV_RNG:
843 printk(KERN_ERR "%s: Invalid send ring block\n", 843 printk(KERN_ERR "%s: Invalid send ring block\n",
844 dev->name); 844 dev->name);
845 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 845 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
846 &regs->HostCtrl); 846 &regs->HostCtrl);
847 wmb(); 847 wmb();
848 break; 848 break;
849 case E_TX_INV_BUF: 849 case E_TX_INV_BUF:
850 printk(KERN_ERR "%s: Invalid send buffer address\n", 850 printk(KERN_ERR "%s: Invalid send buffer address\n",
851 dev->name); 851 dev->name);
852 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 852 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
853 &regs->HostCtrl); 853 &regs->HostCtrl);
854 wmb(); 854 wmb();
855 break; 855 break;
856 case E_TX_INV_DSC: 856 case E_TX_INV_DSC:
857 printk(KERN_ERR "%s: Invalid descriptor address\n", 857 printk(KERN_ERR "%s: Invalid descriptor address\n",
858 dev->name); 858 dev->name);
859 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 859 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
860 &regs->HostCtrl); 860 &regs->HostCtrl);
861 wmb(); 861 wmb();
862 break; 862 break;
@@ -910,21 +910,21 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
910 case E_RX_INV_BUF: 910 case E_RX_INV_BUF:
911 printk(KERN_ERR "%s: Invalid receive buffer " 911 printk(KERN_ERR "%s: Invalid receive buffer "
912 "address\n", dev->name); 912 "address\n", dev->name);
913 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 913 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
914 &regs->HostCtrl); 914 &regs->HostCtrl);
915 wmb(); 915 wmb();
916 break; 916 break;
917 case E_RX_INV_DSC: 917 case E_RX_INV_DSC:
918 printk(KERN_ERR "%s: Invalid receive descriptor " 918 printk(KERN_ERR "%s: Invalid receive descriptor "
919 "address\n", dev->name); 919 "address\n", dev->name);
920 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 920 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
921 &regs->HostCtrl); 921 &regs->HostCtrl);
922 wmb(); 922 wmb();
923 break; 923 break;
924 case E_RNG_BLK: 924 case E_RNG_BLK:
925 printk(KERN_ERR "%s: Invalid ring block\n", 925 printk(KERN_ERR "%s: Invalid ring block\n",
926 dev->name); 926 dev->name);
927 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 927 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
928 &regs->HostCtrl); 928 &regs->HostCtrl);
929 wmb(); 929 wmb();
930 break; 930 break;
@@ -1011,15 +1011,15 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
1011 if (newskb){ 1011 if (newskb){
1012 dma_addr_t addr; 1012 dma_addr_t addr;
1013 1013
1014 pci_unmap_single(rrpriv->pci_dev, 1014 pci_unmap_single(rrpriv->pci_dev,
1015 desc->addr.addrlo, dev->mtu + 1015 desc->addr.addrlo, dev->mtu +
1016 HIPPI_HLEN, PCI_DMA_FROMDEVICE); 1016 HIPPI_HLEN, PCI_DMA_FROMDEVICE);
1017 skb = rx_skb; 1017 skb = rx_skb;
1018 skb_put(skb, pkt_len); 1018 skb_put(skb, pkt_len);
1019 rrpriv->rx_skbuff[index] = newskb; 1019 rrpriv->rx_skbuff[index] = newskb;
1020 addr = pci_map_single(rrpriv->pci_dev, 1020 addr = pci_map_single(rrpriv->pci_dev,
1021 newskb->data, 1021 newskb->data,
1022 dev->mtu + HIPPI_HLEN, 1022 dev->mtu + HIPPI_HLEN,
1023 PCI_DMA_FROMDEVICE); 1023 PCI_DMA_FROMDEVICE);
1024 set_rraddr(&desc->addr, addr); 1024 set_rraddr(&desc->addr, addr);
1025 } else { 1025 } else {
@@ -1199,7 +1199,7 @@ static void rr_timer(unsigned long data)
1199 1199
1200 if (rr_init1(dev)) { 1200 if (rr_init1(dev)) {
1201 spin_lock_irqsave(&rrpriv->lock, flags); 1201 spin_lock_irqsave(&rrpriv->lock, flags);
1202 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 1202 writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
1203 &regs->HostCtrl); 1203 &regs->HostCtrl);
1204 spin_unlock_irqrestore(&rrpriv->lock, flags); 1204 spin_unlock_irqrestore(&rrpriv->lock, flags);
1205 } 1205 }
@@ -1291,7 +1291,7 @@ static int rr_open(struct net_device *dev)
1291 } 1291 }
1292 1292
1293 netif_stop_queue(dev); 1293 netif_stop_queue(dev);
1294 1294
1295 return ecode; 1295 return ecode;
1296} 1296}
1297 1297
@@ -1527,7 +1527,7 @@ static int rr_load_firmware(struct net_device *dev)
1527 return -EBUSY; 1527 return -EBUSY;
1528 1528
1529 if (!(readl(&regs->HostCtrl) & NIC_HALTED)){ 1529 if (!(readl(&regs->HostCtrl) & NIC_HALTED)){
1530 printk("%s: Trying to load firmware to a running NIC.\n", 1530 printk("%s: Trying to load firmware to a running NIC.\n",
1531 dev->name); 1531 dev->name);
1532 return -EBUSY; 1532 return -EBUSY;
1533 } 1533 }
@@ -1660,7 +1660,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1660 gf_out: 1660 gf_out:
1661 kfree(image); 1661 kfree(image);
1662 return error; 1662 return error;
1663 1663
1664 case SIOCRRPFW: 1664 case SIOCRRPFW:
1665 if (!capable(CAP_SYS_RAWIO)){ 1665 if (!capable(CAP_SYS_RAWIO)){
1666 return -EPERM; 1666 return -EPERM;
@@ -1712,7 +1712,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1712 kfree(oldimage); 1712 kfree(oldimage);
1713 kfree(image); 1713 kfree(image);
1714 return error; 1714 return error;
1715 1715
1716 case SIOCRRID: 1716 case SIOCRRID:
1717 return put_user(0x52523032, (int __user *)rq->ifr_data); 1717 return put_user(0x52523032, (int __user *)rq->ifr_data);
1718 default: 1718 default:
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-24 18:49:47 -0500