mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'pci/resource' into next
* pci/resource:
microblaze/PCI: Remove pcibios_setup_bus_{self/devices} dead code
ARC: Remove empty kernel/pcibios.c
PCI: Add a generic weak pcibios_align_resource()
PCI: Add a generic weak pcibios_fixup_bus()
This commit is contained in:
commit
9198407e23
16 changed files with 22 additions and 265 deletions
|
|
@ -66,16 +66,6 @@ static int pci_scan_flags[TILE_NUM_PCIE];
|
|||
static struct pci_ops tile_cfg_ops;
|
||||
|
||||
|
||||
/*
|
||||
* We don't need to worry about the alignment of resources.
|
||||
*/
|
||||
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
|
||||
resource_size_t size, resource_size_t align)
|
||||
{
|
||||
return res->start;
|
||||
}
|
||||
EXPORT_SYMBOL(pcibios_align_resource);
|
||||
|
||||
/*
|
||||
* Open a FD to the hypervisor PCI device.
|
||||
*
|
||||
|
|
@ -380,14 +370,6 @@ int __init pcibios_init(void)
|
|||
}
|
||||
subsys_initcall(pcibios_init);
|
||||
|
||||
/*
|
||||
* No bus fixups needed.
|
||||
*/
|
||||
void pcibios_fixup_bus(struct pci_bus *bus)
|
||||
{
|
||||
/* Nothing needs to be done. */
|
||||
}
|
||||
|
||||
void pcibios_set_master(struct pci_dev *dev)
|
||||
{
|
||||
/* No special bus mastering setup handling. */
|
||||
|
|
|
|||
|
|
@ -108,15 +108,6 @@ static struct pci_ops tile_cfg_ops;
|
|||
/* Mask of CPUs that should receive PCIe interrupts. */
|
||||
static struct cpumask intr_cpus_map;
|
||||
|
||||
/* We don't need to worry about the alignment of resources. */
|
||||
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
|
||||
resource_size_t size,
|
||||
resource_size_t align)
|
||||
{
|
||||
return res->start;
|
||||
}
|
||||
EXPORT_SYMBOL(pcibios_align_resource);
|
||||
|
||||
/*
|
||||
* Pick a CPU to receive and handle the PCIe interrupts, based on the IRQ #.
|
||||
* For now, we simply send interrupts to non-dataplane CPUs.
|
||||
|
|
@ -1049,11 +1040,6 @@ alloc_mem_map_failed:
|
|||
}
|
||||
subsys_initcall(pcibios_init);
|
||||
|
||||
/* No bus fixups needed. */
|
||||
void pcibios_fixup_bus(struct pci_bus *bus)
|
||||
{
|
||||
}
|
||||
|
||||
/* Process any "pci=" kernel boot arguments. */
|
||||
char *__init pcibios_setup(char *str)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue