[PATCH] PCI: rename exported pbus_* functions

Traditional naming in pci/setup-xx code assumes that
pdev_*/pbus_* functions are private, everything visible
from outer world should be pci_*.

drivers/hotplug/cpci_hotplug_pci.c

@@ -411,8 +411,8 @@ static int cpci_configure_bridge(struct pci_bus* bus, struct pci_dev* dev)
 	 * Update the bridge resources of the bridge to accommodate devices
 	 * behind it.
 	 */
-	pbus_size_bridges(child);
-	pbus_assign_resources(child);
+	pci_bus_size_bridges(child);
+	pci_bus_assign_resources(child);
 
 	/* Enable resource mapping via command register */
 	command = PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE | PCI_COMMAND_PARITY | PCI_COMMAND_SERR;

drivers/pci/setup-bus.c

@@ -333,13 +333,13 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
 }
 
 void __devinit
-pbus_size_bridges(struct pci_bus *bus)
+pci_bus_size_bridges(struct pci_bus *bus)
 {
 	struct list_head *ln;
 	unsigned long mask, type;
 
 	for (ln=bus->children.next; ln != &bus->children; ln=ln->next)
-		pbus_size_bridges(pci_bus_b(ln));
+		pci_bus_size_bridges(pci_bus_b(ln));
 
 	/* The root bus? */
 	if (!bus->self)
@@ -358,10 +358,10 @@ pbus_size_bridges(struct pci_bus *bus)
 	}
 	pbus_size_mem(bus, mask, type);
 }
-EXPORT_SYMBOL(pbus_size_bridges);
+EXPORT_SYMBOL(pci_bus_size_bridges);
 
 void __devinit
-pbus_assign_resources(struct pci_bus *bus)
+pci_bus_assign_resources(struct pci_bus *bus)
 {
 	struct list_head *ln;
 	int found_vga = pbus_assign_resources_sorted(bus);
@@ -377,11 +377,11 @@ pbus_assign_resources(struct pci_bus *bus)
 	for (ln=bus->children.next; ln != &bus->children; ln=ln->next) {
 		struct pci_bus *b = pci_bus_b(ln);
 
-		pbus_assign_resources(b);
+		pci_bus_assign_resources(b);
 		pci_setup_bridge(b);
 	}
 }
-EXPORT_SYMBOL(pbus_assign_resources);
+EXPORT_SYMBOL(pci_bus_assign_resources);
 
 void __init
 pci_assign_unassigned_resources(void)
@@ -392,10 +392,10 @@ pci_assign_unassigned_resources(void)
 	/* Depth first, calculate sizes and alignments of all
 	   subordinate buses. */
 	for(ln=pci_root_buses.next; ln != &pci_root_buses; ln=ln->next)
-		pbus_size_bridges(pci_bus_b(ln));
+		pci_bus_size_bridges(pci_bus_b(ln));
 	/* Depth last, allocate resources and update the hardware. */
 	for(ln=pci_root_buses.next; ln != &pci_root_buses; ln=ln->next)
-		pbus_assign_resources(pci_bus_b(ln));
+		pci_bus_assign_resources(pci_bus_b(ln));
 
 	pci_for_each_dev(dev) {
 		pdev_enable_device(dev);

include/linux/pci.h

@@ -601,8 +601,8 @@ int pci_enable_wake(struct pci_dev *dev, u32 state, int enable);
 
 /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
 
-void pbus_assign_resources(struct pci_bus *bus);
-void pbus_size_bridges(struct pci_bus *bus);
+void pci_bus_assign_resources(struct pci_bus *bus);
+void pci_bus_size_bridges(struct pci_bus *bus);
 int pci_claim_resource(struct pci_dev *, int);
 void pci_assign_unassigned_resources(void);
 void pdev_enable_device(struct pci_dev *);