kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [KJ] [PATCH 14/18] drivers/video/ remove pci_find_{device, subsys}
@ 2005-02-14  6:29 Amit Gud
  2005-02-14 18:42 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Amit Gud @ 2005-02-14  6:29 UTC (permalink / raw)
  To: kernel-janitors

[-- Attachment #1: Type: text/plain, Size: 2213 bytes --]

Remove deprecated pci_find_device and pci_find_subsys

Do consider applying.

Signed-off-by: Amit Gud <gud@eth.net>

diff -uprN orig/drivers/video/igafb.c linux-2.6.11-rc3/drivers/video/igafb.c
--- orig/drivers/video/igafb.c	2005-01-20 20:06:34.000000000 +0530
+++ linux-2.6.11-rc3/drivers/video/igafb.c	2005-02-14 01:14:30.000000000 +0530
@@ -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;
 		}
diff -uprN orig/drivers/video/pm3fb.c linux-2.6.11-rc3/drivers/video/pm3fb.c
--- orig/drivers/video/pm3fb.c	2004-10-19 03:23:43.000000000 +0530
+++ linux-2.6.11-rc3/drivers/video/pm3fb.c	2005-02-14 01:14:45.000000000 +0530
@@ -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);
 	}
 
diff -uprN orig/drivers/video/sis/sis_main.c linux-2.6.11-rc3/drivers/video/sis/sis_main.c
--- orig/drivers/video/sis/sis_main.c	2005-02-11 15:19:56.000000000 +0530
+++ linux-2.6.11-rc3/drivers/video/sis/sis_main.c	2005-02-14 01:14:52.000000000 +0530
@@ -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;
 }


[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [KJ] [PATCH 14/18] drivers/video/ remove pci_find_{device, subsys}
  2005-02-14  6:29 [KJ] [PATCH 14/18] drivers/video/ remove pci_find_{device, subsys} Amit Gud
@ 2005-02-14 18:42 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2005-02-14 18:42 UTC (permalink / raw)
  To: kernel-janitors

[-- Attachment #1: Type: text/plain, Size: 1158 bytes --]

On Mon, Feb 14, 2005 at 11:47:31AM +0530, Amit Gud wrote:
> Remove deprecated pci_find_device and pci_find_subsys
> 
> Do consider applying.
> 
> Signed-off-by: Amit Gud <gud@eth.net>
> 
> diff -uprN orig/drivers/video/igafb.c linux-2.6.11-rc3/drivers/video/igafb.c
> --- orig/drivers/video/igafb.c	2005-01-20 20:06:34.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/video/igafb.c	2005-02-14 01:14:30.000000000 +0530
> @@ -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;
>  		}

No, this is incorrect.  Please do not apply.

thanks,

greg k-h

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-02-14 18:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-14  6:29 [KJ] [PATCH 14/18] drivers/video/ remove pci_find_{device, subsys} Amit Gud
2005-02-14 18:42 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).