patch-2.4.15 linux/drivers/net/irda/vlsi_ir.c
Next file: linux/drivers/net/natsemi.c
Previous file: linux/drivers/net/irda/irda-usb.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
Fri Nov 9 13:41:42 2001
- Orig file:
v2.4.14/linux/drivers/net/irda/vlsi_ir.c
- Orig date:
Tue Oct 9 17:06:52 2001
diff -u --recursive --new-file v2.4.14/linux/drivers/net/irda/vlsi_ir.c linux/drivers/net/irda/vlsi_ir.c
@@ -1238,7 +1238,7 @@
}
printk(KERN_INFO "%s: registered device %s\n", drivername, ndev->name);
- pdev->driver_data = ndev;
+ pci_set_drvdata(pdev, ndev);
return 0;
@@ -1247,13 +1247,13 @@
out_disable:
pci_disable_device(pdev);
out:
- pdev->driver_data = NULL;
+ pci_set_drvdata(pdev, NULL);
return -ENODEV;
}
static void __devexit vlsi_irda_remove(struct pci_dev *pdev)
{
- struct net_device *ndev = pdev->driver_data;
+ struct net_device *ndev = pci_get_drvdata(pdev);
if (ndev) {
printk(KERN_INFO "%s: unregister device %s\n",
@@ -1267,7 +1267,7 @@
}
else
printk(KERN_CRIT "%s: lost netdevice?\n", drivername);
- pdev->driver_data = NULL;
+ pci_set_drvdata(pdev, NULL);
pci_disable_device(pdev);
printk(KERN_INFO "%s: %s disabled\n", drivername, pdev->name);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)