Skip to contentSkip to conversation

drivers/mtd/ remove pci_find_{device, subsys}

PATCH In review Amit Gud 4 participants 5 messages Feb 14, 2005

Subsystems (3)
Kernel janitors Memory technology devices (MTD) SCx200 CPU support
lore
Share & tools
lore

Amit Gud

author
#0 lore raw

PATCH 8/18 drivers/mtd/ remove pci_find_{device, subsys}

Remove deprecated pci_find_device and pci_find_subsys

AG
--
May the source be with you

Signed-off-by Amit Gud <[email protected]>
drivers/mtd/devices/pmc551.c +1 -1
diff -uprN orig/drivers/mtd/devices/pmc551.c linux-2.6.11-rc3/drivers/mtd/devices/pmc551.c
@@ -680,7 +680,7 @@ static int __init init_pmc551(void)
          */
         for( count = 0; count < MAX_MTD_DEVICES; count++ ) {
 
-                if ((PCI_Device = pci_find_device(PCI_VENDOR_ID_V3_SEMI,
+                if ((PCI_Device = pci_get_device(PCI_VENDOR_ID_V3_SEMI,
                                                   PCI_DEVICE_ID_V3_SEMI_V370PDC,
 						  PCI_Device ) ) == NULL) {
                         break;
drivers/mtd/maps/amd76xrom.c +1 -1
diff -uprN orig/drivers/mtd/maps/amd76xrom.c linux-2.6.11-rc3/drivers/mtd/maps/amd76xrom.c
@@ -304,7 +304,7 @@ static int __init init_amd76xrom(void)
 	struct pci_device_id *id;
 	pdev = NULL;
 	for(id = amd76xrom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, NULL);
+		pdev = pci_get_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}
drivers/mtd/maps/ich2rom.c +1 -1
diff -uprN orig/drivers/mtd/maps/ich2rom.c linux-2.6.11-rc3/drivers/mtd/maps/ich2rom.c
@@ -288,7 +288,7 @@ int __init init_ich2rom(void)
 	struct pci_device_id *id;
 	pdev = NULL;
 	for(id = ich2rom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, NULL);
+		pdev = pci_get_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}
drivers/mtd/maps/ichxrom.c +1 -1
diff -uprN orig/drivers/mtd/maps/ichxrom.c linux-2.6.11-rc3/drivers/mtd/maps/ichxrom.c
@@ -356,7 +356,7 @@ static int __init init_ichxrom(void)
 
 	pdev = NULL;
 	for (id = ichxrom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, NULL);
+		pdev = pci_get_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}
drivers/mtd/maps/l440gx.c +2 -2
diff -uprN orig/drivers/mtd/maps/l440gx.c linux-2.6.11-rc3/drivers/mtd/maps/l440gx.c
@@ -62,10 +62,10 @@ static int __init init_l440gx(void)
 	struct resource *pm_iobase;
 	__u16 word;
 
-	dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
+	dev = pci_get_device(PCI_VENDOR_ID_INTEL, 
 		PCI_DEVICE_ID_INTEL_82371AB_0, NULL);
 
-	pm_dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
+	pm_dev = pci_get_device(PCI_VENDOR_ID_INTEL, 
 		PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
 
 	if (!dev || !pm_dev) {
drivers/mtd/maps/scx200_docflash.c +1 -1
diff -uprN orig/drivers/mtd/maps/scx200_docflash.c linux-2.6.11-rc3/drivers/mtd/maps/scx200_docflash.c
@@ -88,7 +88,7 @@ static int __init init_scx200_docflash(v
 
 	printk(KERN_DEBUG NAME ": NatSemi SCx200 DOCCS Flash Driver\n");
 
-	if ((bridge = pci_find_device(PCI_VENDOR_ID_NS, 
+	if ((bridge = pci_get_device(PCI_VENDOR_ID_NS, 
 				      PCI_DEVICE_ID_NS_SCx200_BRIDGE,
 				      NULL)) == NULL)
 		return -ENODEV;

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

#1 lore raw

Looks fairly simple, but I've never dealt with pci_find_device(), so my voice doesn't count.

dwmw2, is this ok?

Quoted 80 lines · Amit Gud

Remove deprecated pci_find_device and pci_find_subsys

AG
--
May the source be with you

Signed-off-by Amit Gud <[email protected]>

diff -uprN orig/drivers/mtd/devices/pmc551.c linux-2.6.11-rc3/drivers/mtd/devices/pmc551.c

drivers/mtd/devices/pmc551.c +1 -1
@@ -680,7 +680,7 @@ static int __init init_pmc551(void)
          */
         for( count = 0; count < MAX_MTD_DEVICES; count++ ) {
 
-                if ((PCI_Device = pci_find_device(PCI_VENDOR_ID_V3_SEMI,
+                if ((PCI_Device = pci_get_device(PCI_VENDOR_ID_V3_SEMI,
                                                   PCI_DEVICE_ID_V3_SEMI_V370PDC,
 						  PCI_Device ) ) = NULL) {
                         break;

diff -uprN orig/drivers/mtd/maps/amd76xrom.c linux-2.6.11-rc3/drivers/mtd/maps/amd76xrom.c

drivers/mtd/maps/amd76xrom.c +1 -1
@@ -304,7 +304,7 @@ static int __init init_amd76xrom(void)
 	struct pci_device_id *id;
 	pdev = NULL;
 	for(id = amd76xrom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, NULL);
+		pdev = pci_get_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}

diff -uprN orig/drivers/mtd/maps/ich2rom.c linux-2.6.11-rc3/drivers/mtd/maps/ich2rom.c

drivers/mtd/maps/ich2rom.c +1 -1
@@ -288,7 +288,7 @@ int __init init_ich2rom(void)
 	struct pci_device_id *id;
 	pdev = NULL;
 	for(id = ich2rom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, NULL);
+		pdev = pci_get_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}

diff -uprN orig/drivers/mtd/maps/ichxrom.c linux-2.6.11-rc3/drivers/mtd/maps/ichxrom.c

drivers/mtd/maps/ichxrom.c +1 -1
@@ -356,7 +356,7 @@ static int __init init_ichxrom(void)
 
 	pdev = NULL;
 	for (id = ichxrom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, NULL);
+		pdev = pci_get_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}

diff -uprN orig/drivers/mtd/maps/l440gx.c linux-2.6.11-rc3/drivers/mtd/maps/l440gx.c

drivers/mtd/maps/l440gx.c +2 -2
@@ -62,10 +62,10 @@ static int __init init_l440gx(void)
 	struct resource *pm_iobase;
 	__u16 word;
 
-	dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
+	dev = pci_get_device(PCI_VENDOR_ID_INTEL, 
 		PCI_DEVICE_ID_INTEL_82371AB_0, NULL);
 
-	pm_dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
+	pm_dev = pci_get_device(PCI_VENDOR_ID_INTEL, 
 		PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
 
 	if (!dev || !pm_dev) {

diff -uprN orig/drivers/mtd/maps/scx200_docflash.c linux-2.6.11-rc3/drivers/mtd/maps/scx200_docflash.c

drivers/mtd/maps/scx200_docflash.c static int __init init_scx200_docflash(v · line 94

Quoted 8 lines
drivers/mtd/maps/scx200_docflash.c +1 -1
@@ -88,7 +88,7 @@ static int __init init_scx200_docflash(v
 
 	printk(KERN_DEBUG NAME ": NatSemi SCx200 DOCCS Flash Driver\n");
 
-	if ((bridge = pci_find_device(PCI_VENDOR_ID_NS, 
+	if ((bridge = pci_get_device(PCI_VENDOR_ID_NS, 
 				      PCI_DEVICE_ID_NS_SCx200_BRIDGE,
 				      NULL)) = NULL)
 		return -ENODEV;

Jörn

Signature · 7 lines
Optimizations always bust things, because all optimizations are, in
the long haul, a form of cheating, and cheaters eventually get caught.
-- Larry Wall 
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
#2 lore raw

Re: [KJ] Re: [PATCH 8/18] drivers/mtd/ remove pci_find_{device,

Quoted 4 lines · J?rn Engel

Looks fairly simple, but I've never dealt with pci_find_device(), so my voice doesn't count.

dwmw2, is this ok?

No it isn't, please do not apply. See my KJ response for why it is not correct.

thanks,

greg k-h

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

#3 lore raw
In reply to Jörn Engel
Quoted 2 lines · Jörn Engel

Looks fairly simple, but I've never dealt with pci_find_device(), so my voice doesn't count.

When switching from pci_find_device to pci_get_device the corresponding call to pci_dev_put() needs to be added.

In addition we need an entry in compat.h

Beyond that ich2rom.c should just be deleted. It was renamed ichxrom.c a while ago.

Eric

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

#4 lore raw
In reply to Amit Gud
Quoted 15 lines · Amit Gud

Remove deprecated pci_find_device and pci_find_subsys

AG
--
May the source be with you

Signed-off-by Amit Gud <[email protected]>

diff -uprN orig/drivers/mtd/devices/pmc551.c linux-2.6.11-rc3/drivers/mtd/devices/pmc551.c

drivers/mtd/devices/pmc551.c static int __init init_pmc551(void) · line 686

Quoted 8 lines
drivers/mtd/devices/pmc551.c +1 -1
@@ -680,7 +680,7 @@ static int __init init_pmc551(void)
          */
         for( count = 0; count < MAX_MTD_DEVICES; count++ ) {
 
-                if ((PCI_Device = pci_find_device(PCI_VENDOR_ID_V3_SEMI,
+                if ((PCI_Device = pci_get_device(PCI_VENDOR_ID_V3_SEMI,
                                                   PCI_DEVICE_ID_V3_SEMI_V370PDC,
 						  PCI_Device ) ) == NULL) {
                         break;

Ick, NO!

You can't just always use pci_get_device() instead of pci_find_device(). You need to do other things to the code to get the reference counting logic to work properly.

Please read the documentation of pci_get_device() before doing such a search-and-replace work on the whole tree. In short, almost all of these patches in these series are wrong.

thanks,

greg k-h

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