patch-2.4.15 linux/drivers/char/joystick/emu10k1-gp.c

Next file: linux/drivers/char/joystick/pcigame.c
Previous file: linux/drivers/char/joystick/cs461x.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.14/linux/drivers/char/joystick/emu10k1-gp.c linux/drivers/char/joystick/emu10k1-gp.c
@@ -86,7 +86,7 @@
 	port->gameport.io = ioport;
 	port->size = iolen;
 	port->dev = pdev;
-	pdev->driver_data = port;
+	pci_set_drvdata(pdev, port);
 
 	gameport_register_port(&port->gameport);
 
@@ -98,7 +98,7 @@
 
 static void __devexit emu_remove(struct pci_dev *pdev)
 {
-	struct emu *port = (struct emu *)pdev->driver_data;
+	struct emu *port = pci_get_drvdata(pdev);
 	gameport_unregister_port(&port->gameport);
 	release_region(port->gameport.io, port->size);
 	kfree(port);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)