Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0b7f9cd authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/deprecate-get-bus-and-slot' into next 

* pci/deprecate-get-bus-and-slot:
  video: fbdev: riva: deprecate pci_get_bus_and_slot()
  video: fbdev: nvidia: deprecate pci_get_bus_and_slot()
  video: fbdev: intelfb: deprecate pci_get_bus_and_slot()
  openprom: Deprecate pci_get_bus_and_slot()
  xen/pcifront: Deprecate pci_get_bus_and_slot()
  PCI: Deprecate pci_get_bus_and_slot()
  PCI: ibmphp: Deprecate pci_get_bus_and_slot()
  PCI: cpqhp: Deprecate pci_get_bus_and_slot()
  pch_gbe: Deprecate pci_get_bus_and_slot()
  bnx2x: Deprecate pci_get_bus_and_slot()
  powerpc/via-pmu: Deprecate pci_get_bus_and_slot()
  iommu/amd: Deprecate pci_get_bus_and_slot()
  sl82c105: deprecate pci_get_bus_and_slot()
  drm/nouveau: deprecate pci_get_bus_and_slot()
  drm/gma500: Deprecate pci_get_bus_and_slot()
  ibft: Deprecate pci_get_bus_and_slot()
  edd: Deprecate pci_get_bus_and_slot()
  agp: sworks: Deprecate pci_get_bus_and_slot()
  agp: nvidia: Deprecate pci_get_bus_and_slot()
  ata: Deprecate pci_get_bus_and_slot()
  x86/PCI: Deprecate pci_get_bus_and_slot()
  powerpc/PCI: Deprecate pci_get_bus_and_slot()
  alpha/PCI: Deprecate pci_get_bus_and_slot()
parents 3ea8bc33 e2281080

arch/alpha/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn) 
		if (bus == 0 && dfn == 0) {

			hose = pci_isa_hose;

		} else {

			dev = pci_get_bus_and_slot(bus, dfn);

			dev = pci_get_domain_bus_and_slot(0, bus, dfn);

			if (!dev)

				return -ENODEV;

			hose = dev->sysdata;

arch/alpha/kernel/sys_nautilus.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ nautilus_init_pci(void) 
	bus = hose->bus = bridge->bus;

	pcibios_claim_one_bus(bus);



	irongate = pci_get_bus_and_slot(0, 0);

	irongate = pci_get_domain_bus_and_slot(pci_domain_nr(bus), 0, 0);

	bus->self = irongate;

	bus->resource[0] = &irongate_io;

	bus->resource[1] = &irongate_mem;

arch/powerpc/kernel/pci_32.c

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ make_one_node_map(struct device_node* node, u8 pci_bus) 
		reg = of_get_property(node, "reg", NULL);

		if (!reg)

			continue;

		dev = pci_get_bus_and_slot(pci_bus, ((reg[0] >> 8) & 0xff));

		dev = pci_get_domain_bus_and_slot(0, pci_bus,

						  ((reg[0] >> 8) & 0xff));

		if (!dev || !dev->subordinate) {

			pci_dev_put(dev);

			continue;

arch/powerpc/platforms/powermac/feature.c

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ core99_ata100_enable(struct device_node *node, long value) 


	if (value) {

		if (pci_device_from_OF_node(node, &pbus, &pid) == 0)

			pdev = pci_get_bus_and_slot(pbus, pid);

			pdev = pci_get_domain_bus_and_slot(0, pbus, pid);

		if (pdev == NULL)

			return 0;

		rc = pci_enable_device(pdev);

arch/powerpc/sysdev/mv64x60_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static ssize_t mv64x60_hs_reg_read(struct file *filp, struct kobject *kobj, 
	if (count < MV64X60_VAL_LEN_MAX)

		return -EINVAL;



	phb = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));

	phb = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));

	if (!phb)

		return -ENODEV;

	pci_read_config_dword(phb, MV64X60_PCICFG_CPCI_HOTSWAP, &v);
@@ -61,7 +61,7 @@ static ssize_t mv64x60_hs_reg_write(struct file *filp, struct kobject *kobj, 
	if (sscanf(buf, "%i", &v) != 1)

		return -EINVAL;



	phb = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));

	phb = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));

	if (!phb)

		return -ENODEV;

	pci_write_config_dword(phb, MV64X60_PCICFG_CPCI_HOTSWAP, v);