drivers/media/ remove pci_find_{device, subsys}
Subsystems (2)
PATCH 7/18 drivers/media/ remove pci_find_{device, subsys}
Remove deprecated pci_find_device and pci_find_subsys
AG
--
May the source be with you
drivers/media/radio/radio-maestro.c +2 -2
@@ -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);
drivers/media/video/bttv-cards.c +1 -1
@@ -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);
drivers/media/video/stradis.c +1 -1
@@ -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
drivers/media/video/zoran_card.c +1 -1
@@ -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];
drivers/media/video/zr36120.c +1 -1
@@ -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];
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 56 lines · Amit Gud
Remove deprecated
pci_find_deviceandpci_find_subsysAG
--
May the source be with youSigned-off-by Amit Gud <[email protected]>diff -uprN
orig/drivers/media/radio/radio-maestro.clinux-2.6.11-rc3/drivers/media/radio/radio-maestro.cdrivers/media/radio/radio-maestro.c +2
-2@@ -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.clinux-2.6.11-rc3/drivers/media/video/bttv-cards.cdrivers/media/video/bttv-cards.c +1
-1@@ -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.clinux-2.6.11-rc3/drivers/media/video/stradis.cdrivers/media/video/stradis.c +1
-1@@ -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.clinux-2.6.11-rc3/drivers/media/video/zoran_card.c
drivers/media/video/zoran_card.c find_zr36057 (void) · line 1201
Quoted 8 lines
drivers/media/video/zoran_card.c +1
-1@@ -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
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors