patch-2.4.0-test9 linux/drivers/net/ne2k-pci.c

• Lines: 31
• Date: Mon Sep 18 14:57:01 2000
• Orig file: v2.4.0-test8/linux/drivers/net/ne2k-pci.c
• Orig date: Mon Jun 19 13:30:58 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/net/ne2k-pci.c linux/drivers/net/ne2k-pci.c
@@ -286,7 +286,7 @@
 	/* Set up the rest of the parameters. */
 	dev->irq = irq;
 	dev->base_addr = ioaddr;
-	pdev->driver_data = dev;
+	pci_set_drvdata(pdev, dev);
 
 	/* Allocate dev->priv and fill in 8390 specific dev fields. */
 	if (ethdev_init(dev)) {
@@ -535,16 +535,17 @@
 
 static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev)
 {
-	struct net_device *dev = pdev->driver_data;
+	struct net_device *dev = pci_get_drvdata(pdev);
 	
 	if (!dev) {
 		printk (KERN_ERR "bug! ne2k_pci_remove_one called w/o net_device\n");
 		return;
 	}
 	
-	unregister_netdev (dev);
-	release_region (dev->base_addr, NE_IO_EXTENT);
-	kfree (dev);
+	unregister_netdev(dev);
+	release_region(dev->base_addr, NE_IO_EXTENT);
+	kfree(dev);
+	pci_set_drvdata(pdev, NULL);
 }