patch-2.4.0-test9 linux/drivers/video/riva/fbdev.c

• Lines: 27
• Date: Mon Sep 18 14:57:01 2000
• Orig file: v2.4.0-test8/linux/drivers/video/riva/fbdev.c
• Orig date: Mon Jul 31 11:21:37 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/video/riva/fbdev.c linux/drivers/video/riva/fbdev.c
@@ -582,7 +582,7 @@
 
 	riva_boards = riva_board_list_add(riva_boards, rinfo);
 
-	pd->driver_data = rinfo;
+	pci_set_drvdata (pd, rinfo);
 
 	printk ("PCI Riva NV%d framebuffer ver %s (%s, %dMB @ 0x%lX)\n",
 		rinfo->riva.Architecture,
@@ -610,7 +610,7 @@
 
 static void __devexit rivafb_remove_one (struct pci_dev *pd)
 {
-	struct rivafb_info *board = pd->driver_data;
+	struct rivafb_info *board = pci_get_drvdata (pd);
 	
 	if (!board)
 		return;
@@ -630,6 +630,8 @@
 			    board->base1_region_size);
 
 	kfree (board);
+
+	pci_set_drvdata (pd, NULL);
 }