Skip to contentSkip to conversation

drivers/video/ remove pci_find_{device, subsys}

PATCH In review Amit Gud 2 participants 2 messages Feb 14, 2005

Subsystems (2)
lore
Share & tools
lore

Amit Gud

author
#0 lore raw

PATCH 14/18 drivers/video/ remove pci_find_{device, subsys}

Remove deprecated pci_find_device and pci_find_subsys

Do consider applying.

drivers/video/igafb.c +2 -2
diff -uprN orig/drivers/video/igafb.c linux-2.6.11-rc3/drivers/video/igafb.c
@@ -388,14 +388,14 @@ int __init igafb_init(void)
         if (!con_is_present())
                 return -ENXIO;
 
-        pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 
+        pdev = pci_get_device(PCI_VENDOR_ID_INTERG, 
                                PCI_DEVICE_ID_INTERG_1682, 0);
 	if (pdev == NULL) {
 		/*
 		 * XXX We tried to use cyber2000fb.c for IGS 2000.
 		 * But it does not initialize the chip in JavaStation-E, alas.
 		 */
-        	pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);
+        	pdev = pci_get_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);
         	if(pdev == NULL) {
         	        return -ENXIO;
 		}
drivers/video/pm3fb.c +2 -2
diff -uprN orig/drivers/video/pm3fb.c linux-2.6.11-rc3/drivers/video/pm3fb.c
@@ -3370,13 +3370,13 @@ static void pm3fb_detect(void)
 	}
 
 	dev =
-	    pci_find_device(PCI_VENDOR_ID_3DLABS,
+	    pci_get_device(PCI_VENDOR_ID_3DLABS,
 			    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
 
 	for (i = 0; ((i < PM3_MAX_BOARD) && dev); i++) {
 		dev_array[i] = dev;
 		dev =
-		    pci_find_device(PCI_VENDOR_ID_3DLABS,
+		    pci_get_device(PCI_VENDOR_ID_3DLABS,
 				    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
 	}
 
drivers/video/sis/sis_main.c +1 -1
diff -uprN orig/drivers/video/sis/sis_main.c linux-2.6.11-rc3/drivers/video/sis/sis_main.c
@@ -2309,7 +2309,7 @@ static struct pci_dev * sisfb_get_northb
 	default:	return NULL;
 	}
 	for(i = 0; i < nbridgenum; i++) {
-		if((pdev = pci_find_device(PCI_VENDOR_ID_SI, nbridgeids[nbridgeidx+i], NULL))) break;
+		if((pdev = pci_get_device(PCI_VENDOR_ID_SI, nbridgeids[nbridgeidx+i], NULL))) break;
 	}
 	return pdev;
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 16 lines · Amit Gud

Remove deprecated pci_find_device and pci_find_subsys

Do consider applying.

diff -uprN orig/drivers/video/igafb.c linux-2.6.11-rc3/drivers/video/igafb.c

drivers/video/igafb.c +1 -1
@@ -388,14 +388,14 @@ int __init igafb_init(void)
         if (!con_is_present())
                 return -ENXIO;
 
-        pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 
+        pdev = pci_get_device(PCI_VENDOR_ID_INTERG, 
                                PCI_DEVICE_ID_INTERG_1682, 0);

drivers/video/igafb.c int __init igafb_init(void) · line 401

Quoted 10 lines
drivers/video/igafb.c +1 -1
 	if (pdev == NULL) {
 		/*
 		 * XXX We tried to use cyber2000fb.c for IGS 2000.
 		 * But it does not initialize the chip in JavaStation-E, alas.
 		 */
-        	pdev = pci_find_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);
+        	pdev = pci_get_device(PCI_VENDOR_ID_INTERG, 0x2000, 0);
         	if(pdev == NULL) {
         	        return -ENXIO;
 		}

No, this is incorrect. Please do not apply.

thanks,

greg k-h

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors