patch-2.4.15 linux/drivers/usb/uhci.c

• Lines: 36
• Date: Fri Nov 9 13:41:42 2001
• Orig file: v2.4.14/linux/drivers/usb/uhci.c
• Orig date: Tue Oct 23 22:48:52 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/usb/uhci.c linux/drivers/usb/uhci.c
@@ -2623,7 +2623,7 @@
 	uhci->dev = dev;
 	uhci->io_addr = io_addr;
 	uhci->io_size = io_size;
-	dev->driver_data = uhci;
+	pci_set_drvdata(dev, uhci);
 
 #ifdef CONFIG_PROC_FS
 	uhci->num = uhci_num++;
@@ -2931,7 +2931,7 @@
 
 static void __devexit uhci_pci_remove(struct pci_dev *dev)
 {
-	struct uhci *uhci = dev->driver_data;
+	struct uhci *uhci = pci_get_drvdata(dev);
 
 	if (uhci->bus->root_hub)
 		usb_disconnect(&uhci->bus->root_hub);
@@ -2956,14 +2956,14 @@
 #ifdef CONFIG_PM
 static int uhci_pci_suspend(struct pci_dev *dev, u32 state)
 {
-	suspend_hc((struct uhci *) dev->driver_data);
+	suspend_hc((struct uhci *) pci_get_drvdata(dev));
 	return 0;
 }
 
 static int uhci_pci_resume(struct pci_dev *dev)
 {
-	reset_hc((struct uhci *) dev->driver_data);
-	start_hc((struct uhci *) dev->driver_data);
+	reset_hc((struct uhci *) pci_get_drvdata(dev));
+	start_hc((struct uhci *) pci_get_drvdata(dev));
 	return 0;
 }
 #endif