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

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

Remove deprecated pci_find_device and pci_find_subsys


AG
--
May the source be with you


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


diff -uprN orig/drivers/media/radio/radio-maestro.c linux-2.6.11-rc3/drivers/media/radio/radio-maestro.c
--- orig/drivers/media/radio/radio-maestro.c	2005-02-11 15:19:47.000000000 +0530
+++ linux-2.6.11-rc3/drivers/media/radio/radio-maestro.c	2005-02-14 02:17:13.000000000 +0530
@@ -265,11 +265,11 @@ static int __init maestro_radio_init(voi
 {
 	register __u16 found=0;
 	struct pci_dev *pcidev = NULL;
-	while(!found && (pcidev = pci_find_device(PCI_VENDOR_ESS, 
+	while(!found && (pcidev = pci_get_device(PCI_VENDOR_ESS, 
 						  PCI_DEVICE_ID_ESS_ESS1968,
 						  pcidev)))
 		found |= radio_install(pcidev);
-	while(!found && (pcidev = pci_find_device(PCI_VENDOR_ESS,
+	while(!found && (pcidev = pci_get_device(PCI_VENDOR_ESS,
 						  PCI_DEVICE_ID_ESS_ESS1978, 
 						  pcidev)))
 		found |= radio_install(pcidev);
diff -uprN orig/drivers/media/video/bttv-cards.c linux-2.6.11-rc3/drivers/media/video/bttv-cards.c
--- orig/drivers/media/video/bttv-cards.c	2005-02-11 15:19:47.000000000 +0530
+++ linux-2.6.11-rc3/drivers/media/video/bttv-cards.c	2005-02-14 02:17:22.000000000 +0530
@@ -4124,7 +4124,7 @@ void __devinit bttv_check_chipset(void)
 	if (UNSET != latency)
 		printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency);
 
-	while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL,
+	while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL,
 				      PCI_DEVICE_ID_INTEL_82441, dev))) {
                 unsigned char b;
 		pci_read_config_byte(dev, 0x53, &b);
diff -uprN orig/drivers/media/video/stradis.c linux-2.6.11-rc3/drivers/media/video/stradis.c
--- orig/drivers/media/video/stradis.c	2005-02-11 15:19:47.000000000 +0530
+++ linux-2.6.11-rc3/drivers/media/video/stradis.c	2005-02-14 02:17:28.000000000 +0530
@@ -2227,7 +2227,7 @@ static int __init stradis_init (void)
 
 	saa_num = 0;
 
-	while ((dev = pci_find_device(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, dev))) {
+	while ((dev = pci_get_device(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, dev))) {
 		if (!dev->subsystem_vendor)
 			printk(KERN_INFO "stradis%d: rev1 decoder\n", saa_num);
 		else
diff -uprN orig/drivers/media/video/zoran_card.c linux-2.6.11-rc3/drivers/media/video/zoran_card.c
--- orig/drivers/media/video/zoran_card.c	2005-02-11 15:19:47.000000000 +0530
+++ linux-2.6.11-rc3/drivers/media/video/zoran_card.c	2005-02-14 02:17:33.000000000 +0530
@@ -1195,7 +1195,7 @@ find_zr36057 (void)
 	zoran_num = 0;
 	while (zoran_num < BUZ_MAX &&
 	       (dev =
-		pci_find_device(PCI_VENDOR_ID_ZORAN,
+		pci_get_device(PCI_VENDOR_ID_ZORAN,
 				PCI_DEVICE_ID_ZORAN_36057, dev)) != NULL) {
 		card_num = card[zoran_num];
 		zr = &zoran[zoran_num];
diff -uprN orig/drivers/media/video/zr36120.c linux-2.6.11-rc3/drivers/media/video/zr36120.c
--- orig/drivers/media/video/zr36120.c	2005-02-11 15:19:47.000000000 +0530
+++ linux-2.6.11-rc3/drivers/media/video/zr36120.c	2005-02-14 02:17:40.000000000 +0530
@@ -1841,7 +1841,7 @@ int __init find_zoran(void)
 	unsigned char revision;
 	int zoran_num=0;
 
-	while ((dev = pci_find_device(PCI_VENDOR_ID_ZORAN,PCI_DEVICE_ID_ZORAN_36120, dev)))
+	while ((dev = pci_get_device(PCI_VENDOR_ID_ZORAN,PCI_DEVICE_ID_ZORAN_36120, dev)))
 	{
 		/* Ok, a ZR36120/ZR36125 found! */
 		ztv = &zorans[zoran_num];


[-- 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 7/18] drivers/media/ remove pci_find_{device, subsys}
  2005-02-14  6:01 [KJ] [PATCH 7/18] drivers/media/ remove pci_find_{device, subsys} Amit Gud
@ 2005-02-14 18:47 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2005-02-14 18:47 UTC (permalink / raw)
  To: kernel-janitors

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

On Mon, Feb 14, 2005 at 11:19:49AM +0530, Amit Gud wrote:
> Remove deprecated pci_find_device and pci_find_subsys
> 
> 
> AG
> --
> May the source be with you
> 
> 
> Signed-off-by: Amit Gud <gud@eth.net>
> 
> 
> diff -uprN orig/drivers/media/radio/radio-maestro.c linux-2.6.11-rc3/drivers/media/radio/radio-maestro.c
> --- orig/drivers/media/radio/radio-maestro.c	2005-02-11 15:19:47.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/media/radio/radio-maestro.c	2005-02-14 02:17:13.000000000 +0530
> @@ -265,11 +265,11 @@ static int __init maestro_radio_init(voi
>  {
>  	register __u16 found=0;
>  	struct pci_dev *pcidev = NULL;
> -	while(!found && (pcidev = pci_find_device(PCI_VENDOR_ESS, 
> +	while(!found && (pcidev = pci_get_device(PCI_VENDOR_ESS, 
>  						  PCI_DEVICE_ID_ESS_ESS1968,
>  						  pcidev)))
>  		found |= radio_install(pcidev);
> -	while(!found && (pcidev = pci_find_device(PCI_VENDOR_ESS,
> +	while(!found && (pcidev = pci_get_device(PCI_VENDOR_ESS,
>  						  PCI_DEVICE_ID_ESS_ESS1978, 
>  						  pcidev)))
>  		found |= radio_install(pcidev);
> diff -uprN orig/drivers/media/video/bttv-cards.c linux-2.6.11-rc3/drivers/media/video/bttv-cards.c
> --- orig/drivers/media/video/bttv-cards.c	2005-02-11 15:19:47.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/media/video/bttv-cards.c	2005-02-14 02:17:22.000000000 +0530
> @@ -4124,7 +4124,7 @@ void __devinit bttv_check_chipset(void)
>  	if (UNSET != latency)
>  		printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency);
>  
> -	while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL,
> +	while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL,
>  				      PCI_DEVICE_ID_INTEL_82441, dev))) {
>                  unsigned char b;
>  		pci_read_config_byte(dev, 0x53, &b);
> diff -uprN orig/drivers/media/video/stradis.c linux-2.6.11-rc3/drivers/media/video/stradis.c
> --- orig/drivers/media/video/stradis.c	2005-02-11 15:19:47.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/media/video/stradis.c	2005-02-14 02:17:28.000000000 +0530
> @@ -2227,7 +2227,7 @@ static int __init stradis_init (void)
>  
>  	saa_num = 0;
>  
> -	while ((dev = pci_find_device(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, dev))) {
> +	while ((dev = pci_get_device(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, dev))) {
>  		if (!dev->subsystem_vendor)
>  			printk(KERN_INFO "stradis%d: rev1 decoder\n", saa_num);
>  		else
> diff -uprN orig/drivers/media/video/zoran_card.c linux-2.6.11-rc3/drivers/media/video/zoran_card.c
> --- orig/drivers/media/video/zoran_card.c	2005-02-11 15:19:47.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/media/video/zoran_card.c	2005-02-14 02:17:33.000000000 +0530
> @@ -1195,7 +1195,7 @@ find_zr36057 (void)
>  	zoran_num = 0;
>  	while (zoran_num < BUZ_MAX &&
>  	       (dev =
> -		pci_find_device(PCI_VENDOR_ID_ZORAN,
> +		pci_get_device(PCI_VENDOR_ID_ZORAN,
>  				PCI_DEVICE_ID_ZORAN_36057, dev)) != NULL) {
>  		card_num = card[zoran_num];
>  		zr = &zoran[zoran_num];


No, this part, and other parts of this patch 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:47 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:01 [KJ] [PATCH 7/18] drivers/media/ remove pci_find_{device, subsys} Amit Gud
2005-02-14 18:47 ` 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).