Commit df58f46c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/jiang-bus-lock-v3' into next 

* pci/jiang-bus-lock-v3:
  PCI: Return early on allocation failures to unindent mainline code
  PCI: Simplify IOV implementation and fix reference count races
  PCI: Drop redundant setting of bus->is_added in virtfn_add_bus()
  unicore32/PCI: Remove redundant call of pci_bus_add_devices()
  m68k/PCI: Remove redundant call of pci_bus_add_devices()
  PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()
  PCI: Fix refcount issue in pci_create_root_bus() error recovery path
  ia64/PCI: Clean up pci_scan_root_bus() usage
  PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)
  PCI: Introduce pci_alloc_dev(struct pci_bus*) to replace alloc_pci_dev()
  PCI: Introduce pci_bus_{get|put}() to manage PCI bus reference count

Conflicts:
	drivers/pci/probe.c
parents 726246d2 05013486

arch/ia64/sn/kernel/io_init.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -326,16 +326,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) 
	bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller,

	bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller,

				&resources);

				&resources);

 	if (bus == NULL)

 	if (bus == NULL)

 		goto error_return; /* error, or bus already scanned */



	bus->sysdata = controller;



	return;



error_return:



		kfree(controller);

		kfree(controller);

	return;

}

}





/*

/*

arch/m68k/platform/coldfire/pci.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,6 @@ static int __init mcf_pci_init(void) 
	pci_bus_size_bridges(rootbus);

	pci_bus_size_bridges(rootbus);

	pci_bus_assign_resources(rootbus);

	pci_bus_assign_resources(rootbus);

	pci_enable_bridges(rootbus);

	pci_enable_bridges(rootbus);

	pci_bus_add_devices(rootbus);

	return 0;

	return 0;

}

}

arch/powerpc/kernel/pci_of_scan.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 
	const char *type;

	const char *type;

	struct pci_slot *slot;

	struct pci_slot *slot;





	dev = alloc_pci_dev();

	dev = pci_alloc_dev(bus);

	if (!dev)

	if (!dev)

		return NULL;

		return NULL;

	type = of_get_property(node, "device_type", NULL);

	type = of_get_property(node, "device_type", NULL);
@@ -137,7 +137,6 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 




	pr_debug("    create device, devfn: %x, type: %s\n", devfn, type);

	pr_debug("    create device, devfn: %x, type: %s\n", devfn, type);





	dev->bus = bus;

	dev->dev.of_node = of_node_get(node);

	dev->dev.of_node = of_node_get(node);

	dev->dev.parent = bus->bridge;

	dev->dev.parent = bus->bridge;

	dev->dev.bus = &pci_bus_type;

	dev->dev.bus = &pci_bus_type;

arch/sparc/kernel/pci.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -254,7 +254,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
	const char *type;

	const char *type;

	u32 class;

	u32 class;





	dev = alloc_pci_dev();

	dev = pci_alloc_dev(bus);

	if (!dev)

	if (!dev)

		return NULL;

		return NULL;
@@ -281,7 +281,6 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
		printk("    create device, devfn: %x, type: %s\n",

		printk("    create device, devfn: %x, type: %s\n",

		       devfn, type);

		       devfn, type);





	dev->bus = bus;

	dev->sysdata = node;

	dev->sysdata = node;

	dev->dev.parent = bus->bridge;

	dev->dev.parent = bus->bridge;

	dev->dev.bus = &pci_bus_type;

	dev->dev.bus = &pci_bus_type;

arch/unicore32/kernel/pci.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -277,11 +277,6 @@ static int __init pci_common_init(void) 
		pci_bus_assign_resources(puv3_bus);

		pci_bus_assign_resources(puv3_bus);

	}

	}





	/*

	 * Tell drivers about devices found.

	 */

	pci_bus_add_devices(puv3_bus);



	return 0;

	return 0;

}

}

subsys_initcall(pci_common_init);

subsys_initcall(pci_common_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE