patch-2.4.2 linux/drivers/net/tokenring/tmspci.c

• Lines: 44
• Date: Fri Feb 16 16:02:36 2001
• Orig file: v2.4.1/linux/drivers/net/tokenring/tmspci.c
• Orig date: Tue Dec 5 12:29:39 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/tokenring/tmspci.c linux/drivers/net/tokenring/tmspci.c
@@ -4,7 +4,7 @@
  *  Written 1999 by Adam Fritzler
  *
  *  This software may be used and distributed according to the terms
- *  of the GNU Public License, incorporated herein by reference.
+ *  of the GNU General Public License, incorporated herein by reference.
  *
  *  This driver module supports the following cards:
  *	- SysKonnect TR4/16(+) PCI	(SK-4590)
@@ -142,14 +142,14 @@
 		printk(":%2.2x", dev->dev_addr[i]);
 	printk("\n");
 		
-	ret = tmsdev_init(dev);
+	ret = tmsdev_init(dev,0, pdev);
+	/* XXX: should be the max PCI32 DMA max */
 	if (ret) {
 		printk("%s: unable to get memory for dev->priv.\n", dev->name);
 		goto err_out_irq;
 	}
 
 	tp = dev->priv;
-	tp->dmalimit = 0; /* XXX: should be the max PCI32 DMA max */
 	tp->setnselout = tms_pci_setnselout_pins;
 		
 	tp->sifreadb = tms_pci_sifreadb;
@@ -172,7 +172,7 @@
 	return 0;
 
 err_out_tmsdev:
-	kfree(dev->priv);
+	tmsdev_term(dev);
 err_out_irq:
 	free_irq(pdev->irq, dev);
 err_out_region:
@@ -228,7 +228,7 @@
 	unregister_netdev(dev);
 	release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
 	free_irq(dev->irq, dev);
-	kfree(dev->priv);
+	tmsdev_term(dev);
 	kfree(dev);
 	pci_set_drvdata(pdev, NULL);
 }