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

Commit 9ccc4fd2 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Remove some iSeries platform checks from the PCI code 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c96bede6

arch/powerpc/kernel/pci_64.c

+8 −15
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <asm/byteorder.h>

#include <asm/machdep.h>

#include <asm/ppc-pci.h>

#include <asm/firmware.h>



#ifdef DEBUG

#include <asm/udbg.h>
@@ -197,9 +196,6 @@ static void __init pcibios_claim_of_setup(void) 
{

	struct pci_bus *b;



	if (firmware_has_feature(FW_FEATURE_ISERIES))

		return;



	list_for_each_entry(b, &pci_root_buses, node)

		pcibios_claim_one_bus(b);

}
@@ -477,7 +473,6 @@ void __devinit scan_phb(struct pci_controller *hose) 
	bus->secondary = hose->first_busno;

	hose->bus = bus;



	if (!firmware_has_feature(FW_FEATURE_ISERIES))

	pcibios_map_io_space(bus);



	bus->resource[0] = res = &hose->io_resource;
@@ -527,7 +522,6 @@ static int __init pcibios_init(void) 
		pci_bus_add_devices(hose->bus);

	}



	if (!firmware_has_feature(FW_FEATURE_ISERIES)) {

	if (pci_probe_only)

		pcibios_claim_of_setup();

	else
@@ -535,7 +529,6 @@ static int __init pcibios_init(void) 
		   pci_assign_unassigned_resources() is able to work

		   correctly with [partially] allocated PCI tree. */

		pci_assign_unassigned_resources();

	}



	/* Call machine dependent final fixup */

	if (ppc_md.pcibios_fixup)

arch/powerpc/platforms/iseries/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -646,6 +646,8 @@ void __init iSeries_pcibios_init(void) 
	/* Install IO hooks */

	ppc_pci_io = iseries_pci_io;



	pci_probe_only = 1;



	/* iSeries has no IO space in the common sense, it needs to set

	 * the IO base to 0

	 */