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

Commit 9198407e authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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()
parents d872694b c775697b

arch/arc/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj-y := arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o 
obj-y	+= signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o

obj-$(CONFIG_ISA_ARCOMPACT)		+= entry-compact.o intc-compact.o

obj-$(CONFIG_ISA_ARCV2)			+= entry-arcv2.o intc-arcv2.o

obj-$(CONFIG_PCI)  			+= pcibios.o



obj-$(CONFIG_MODULES)			+= arcksyms.o module.o

obj-$(CONFIG_SMP) 			+= smp.o

arch/arc/kernel/pcibios.c

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014-2015 Synopsys, Inc. (www.synopsys.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/pci.h>



/*

 * We don't have to worry about legacy ISA devices, so nothing to do here

 */

resource_size_t pcibios_align_resource(void *data, const struct resource *res,

				resource_size_t size, resource_size_t align)

{

	return res->start;

}



void pcibios_fixup_bus(struct pci_bus *bus)

{

}

arch/arm64/kernel/pci.c

+0 −17
Original line number Diff line number Diff line
@@ -22,23 +22,6 @@ 
#include <linux/pci-ecam.h>

#include <linux/slab.h>



/*

 * Called after each bus is probed, but before its children are examined

 */

void pcibios_fixup_bus(struct pci_bus *bus)

{

	/* nothing to do, expected to be removed in the future */

}



/*

 * We don't have to worry about legacy ISA devices, so nothing to do here

 */

resource_size_t pcibios_align_resource(void *data, const struct resource *res,

				resource_size_t size, resource_size_t align)

{

	return res->start;

}



#ifdef CONFIG_ACPI

/*

 * Try to assign the IRQ number when probing a new device

arch/cris/arch-v32/drivers/pci/bios.c

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
#include <linux/kernel.h>

#include <hwregs/intr_vect.h>



void pcibios_fixup_bus(struct pci_bus *b)

{

}



void pcibios_set_master(struct pci_dev *dev)

{

	u8 lat;

arch/ia64/pci/pci.c

+0 −7
Original line number Diff line number Diff line
@@ -411,13 +411,6 @@ pcibios_disable_device (struct pci_dev *dev) 
		acpi_pci_irq_disable(dev);

}



resource_size_t

pcibios_align_resource (void *data, const struct resource *res,

		        resource_size_t size, resource_size_t align)

{

	return res->start;

}



/**

 * ia64_pci_get_legacy_mem - generic legacy mem routine

 * @bus: bus to get legacy memory base address for