frv/PCI: Remove pcibios_last_bus

pcibios_last_bus was apparently copied from x86. On FR-V, it is statically initialized to -1 and never changed unless the user boots with "pci=lastbus=<X>". I doubt that option is used on FR-V, so this patch removes all the code related to pcibios_last_bus. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

frv/PCI: Remove pcibios_last_bus
pcibios_last_bus was apparently copied from x86. On FR-V, it is statically initialized to -1 and never changed unless the user boots with "pci=lastbus=<X>". I doubt that option is used on FR-V, so this patch removes all the code related to pcibios_last_bus. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Bjorn Helgaas
1 parent 869a16157d
Showing 2 changed files with 0 additions and 37 deletions Side-by-side Diff
arch/frv/mb93090-mb00/pci-frv.h
arch/frv/mb93090-mb00/pci-vdk.c
@@ -30,7 +30,6 @@
  
 /* pci-vdk.c */
  
-extern int __nongpreldata pcibios_last_bus;
 extern struct pci_ops *__nongpreldata pci_root_ops;
  
 /* pci-irq.c */
@@ -25,7 +25,6 @@
  
 unsigned int __nongpreldata pci_probe = 1;
  
-int  __nongpreldata pcibios_last_bus = -1;
 struct pci_ops *__nongpreldata pci_root_ops;
  
 /*
@@ -220,37 +219,6 @@
 }
  
 /*
- * Discover remaining PCI buses in case there are peer host bridges.
- * We use the number of last PCI bus provided by the PCI BIOS.
- */
-static void __init pcibios_fixup_peer_bridges(void)
-{
-	struct pci_bus bus;
-	struct pci_dev dev;
-	int n;
-	u16 l;
-
-	if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff)
-		return;
-	printk("PCI: Peer bridge fixup\n");
-	for (n=0; n <= pcibios_last_bus; n++) {
-		if (pci_find_bus(0, n))
-			continue;
-		bus.number = n;
-		bus.ops = pci_root_ops;
-		dev.bus = &bus;
-		for(dev.devfn=0; dev.devfn<256; dev.devfn += 8)
-			if (!pci_read_config_word(&dev, PCI_VENDOR_ID, &l) &&
-			    l != 0x0000 && l != 0xffff) {
-				printk("Found device at %02x:%02x [%04x]\n", n, dev.devfn, l);
-				printk("PCI: Discovered peer bus %02x\n", n);
-				pci_scan_bus(n, pci_root_ops, NULL);
-				break;
-			}
-	}
-}
-
-/*
  * Exceptions for specific devices. Usually work-arounds for fatal design flaws.
  */
  
@@ -418,7 +386,6 @@
 	pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);
  
 	pcibios_irq_init();
-	pcibios_fixup_peer_bridges();
 	pcibios_fixup_irqs();
 	pcibios_resource_survey();
  
@@ -431,9 +398,6 @@
 {
 	if (!strcmp(str, "off")) {
 		pci_probe = 0;
-		return NULL;
-	} else if (!strncmp(str, "lastbus=", 8)) {
-		pcibios_last_bus = simple_strtol(str+8, NULL, 0);
 		return NULL;
 	}
 	return str;
...	...	@@ -30,7 +30,6 @@
30	30
31	31	/* pci-vdk.c */
32	32
33		-extern int __nongpreldata pcibios_last_bus;
34	33	extern struct pci_ops *__nongpreldata pci_root_ops;
35	34
36	35	/* pci-irq.c */
...	...	@@ -25,7 +25,6 @@
25	25
26	26	unsigned int __nongpreldata pci_probe = 1;
27	27
28		-int __nongpreldata pcibios_last_bus = -1;
29	28	struct pci_ops *__nongpreldata pci_root_ops;
30	29
31	30	/*
...	...	@@ -220,37 +219,6 @@
220	219	}
221	220
222	221	/*
223		- * Discover remaining PCI buses in case there are peer host bridges.
224		- * We use the number of last PCI bus provided by the PCI BIOS.
225		- */
226		-static void __init pcibios_fixup_peer_bridges(void)
227		-{
228		- struct pci_bus bus;
229		- struct pci_dev dev;
230		- int n;
231		- u16 l;
232		-
233		- if (pcibios_last_bus <= 0 \|\| pcibios_last_bus >= 0xff)
234		- return;
235		- printk("PCI: Peer bridge fixup\n");
236		- for (n=0; n <= pcibios_last_bus; n++) {
237		- if (pci_find_bus(0, n))
238		- continue;
239		- bus.number = n;
240		- bus.ops = pci_root_ops;
241		- dev.bus = &bus;
242		- for(dev.devfn=0; dev.devfn<256; dev.devfn += 8)
243		- if (!pci_read_config_word(&dev, PCI_VENDOR_ID, &l) &&
244		- l != 0x0000 && l != 0xffff) {
245		- printk("Found device at %02x:%02x [%04x]\n", n, dev.devfn, l);
246		- printk("PCI: Discovered peer bus %02x\n", n);
247		- pci_scan_bus(n, pci_root_ops, NULL);
248		- break;
249		- }
250		- }
251		-}
252		-
253		-/*
254	222	* Exceptions for specific devices. Usually work-arounds for fatal design flaws.
255	223	*/
256	224
...	...	@@ -418,7 +386,6 @@
418	386	pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);
419	387
420	388	pcibios_irq_init();
421		- pcibios_fixup_peer_bridges();
422	389	pcibios_fixup_irqs();
423	390	pcibios_resource_survey();
424	391
...	...	@@ -431,9 +398,6 @@
431	398	{
432	399	if (!strcmp(str, "off")) {
433	400	pci_probe = 0;
434		- return NULL;
435		- } else if (!strncmp(str, "lastbus=", 8)) {
436		- pcibios_last_bus = simple_strtol(str+8, NULL, 0);
437	401	return NULL;
438	402	}
439	403	return str;