Commit f615bca4 authored Jun 08, 2016 by Lorenzo Pieralisi Committed by Bjorn Helgaas Jun 23, 2016

ARM64/PCI: Remove arch-specific pcibios_enable_device()



On systems with PCI_PROBE_ONLY set, we rely on BAR assignments from
firmware.  Previously we did not insert those resources into the resource
tree, so we had to skip pci_enable_resources() because it fails if
resources are not in the resource tree.

Now that we *do* insert resources even when PCI_PROBE_ONLY is set, we no
longer need the ARM64-specific pcibios_enable_device().  Remove it so we
use the generic version.

[bhelgaas: changelog]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Will Deacon <will.deacon@arm.com>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Catalin Marinas <catalin.marinas@arm.com>

parent 04613617

arch/arm64/kernel/pci.c

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -36,19 +36,6 @@ resource_size_t pcibios_align_resource(void data, const struct resource res,
	return res->start;		return res->start;
	}		}

	/**
	* pcibios_enable_device - Enable I/O and memory.
	* @dev: PCI device to be enabled
	* @mask: bitmask of BARs to enable
	*/
	int pcibios_enable_device(struct pci_dev *dev, int mask)
	{
	if (pci_has_flag(PCI_PROBE_ONLY))
	return 0;

	return pci_enable_resources(dev, mask);
	}

	/*		/*
	* Try to assign the IRQ number from DT when adding a new device		* Try to assign the IRQ number from DT when adding a new device
	*/		*/