patch-2.4.15 linux/drivers/pcmcia/pci_socket.c

• Lines: 45
• Date: Fri Nov 9 13:41:42 2001
• Orig file: v2.4.14/linux/drivers/pcmcia/pci_socket.c
• Orig date: Tue Jul 3 17:08:20 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/pcmcia/pci_socket.c linux/drivers/pcmcia/pci_socket.c
@@ -177,13 +177,13 @@
 	memset(socket, 0, sizeof(*socket));
 	socket->dev = dev;
 	socket->op = ops;
-	dev->driver_data = socket;
+	pci_set_drvdata(dev, socket);
 	spin_lock_init(&socket->event_lock);
 	err = socket->op->open(socket);
 	if(err)
 	{
 		socket->dev = NULL;
-		dev->driver_data = NULL;
+		pci_set_drvdata(dev, NULL);
 	}
 	return err;
 }
@@ -210,24 +210,24 @@
 
 static void __devexit cardbus_remove (struct pci_dev *dev)
 {
-	pci_socket_t *socket = (pci_socket_t *) dev->driver_data;
+	pci_socket_t *socket = pci_get_drvdata(dev);
 
 	pcmcia_unregister_socket (socket->pcmcia_socket);
 	if (socket->op && socket->op->close)
 		socket->op->close(socket);
-	dev->driver_data = 0;
+	pci_set_drvdata(dev, NULL);
 }
 
 static int cardbus_suspend (struct pci_dev *dev, u32 state)
 {
-	pci_socket_t *socket = (pci_socket_t *) dev->driver_data;
+	pci_socket_t *socket = pci_get_drvdata(dev);
 	pcmcia_suspend_socket (socket->pcmcia_socket);
 	return 0;
 }
 
 static int cardbus_resume (struct pci_dev *dev)
 {
-	pci_socket_t *socket = (pci_socket_t *) dev->driver_data;
+	pci_socket_t *socket = pci_get_drvdata(dev);
 	pcmcia_resume_socket (socket->pcmcia_socket);
 	return 0;
 }