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

Commit 7281c248 authored by Alan Cox's avatar Alan Cox Committed by Russell King
Browse files

[ARM] switch to new pci_get_bus_and_slot API 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0f6f65f6

arch/arm/mach-ixp2000/ixdp2400.c

+4 −2
Original line number Diff line number Diff line
@@ -133,11 +133,13 @@ static void ixdp2400_pci_postinit(void) 
	struct pci_dev *dev;



	if (ixdp2x00_master_npu()) {

		dev = pci_find_slot(1, IXDP2400_SLAVE_ENET_DEVFN);

		dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN);

		pci_remove_bus_device(dev);

		pci_dev_put(dev)

	} else {

		dev = pci_find_slot(1, IXDP2400_MASTER_ENET_DEVFN);

		dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN);

		pci_remove_bus_device(dev);

		pci_dev_put(dev)



		ixdp2x00_slave_pci_postinit();

	}

arch/arm/mach-ixp2000/ixdp2800.c

+4 −2
Original line number Diff line number Diff line
@@ -261,14 +261,16 @@ int __init ixdp2800_pci_init(void) 


		pci_common_init(&ixdp2800_pci);

		if (ixdp2x00_master_npu()) {

			dev = pci_find_slot(1, IXDP2800_SLAVE_ENET_DEVFN);

			dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN);

			pci_remove_bus_device(dev);

			pci_dev_put(dev);



			ixdp2800_master_enable_slave();

			ixdp2800_master_wait_for_slave_bus_scan();

		} else {

			dev = pci_find_slot(1, IXDP2800_MASTER_ENET_DEVFN);

			dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN);

			pci_remove_bus_device(dev);

			pci_dev_put(dev);

		}

	}

arch/arm/mach-ixp2000/ixdp2x00.c

+5 −2
Original line number Diff line number Diff line
@@ -241,11 +241,14 @@ void ixdp2x00_slave_pci_postinit(void) 
	/*

	 * Remove PMC device is there is one

	 */

	if((dev = pci_find_slot(1, IXDP2X00_PMC_DEVFN)))

	if((dev = pci_get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) {

		pci_remove_bus_device(dev);

		pci_dev_put(dev);

	}



	dev = pci_find_slot(0, IXDP2X00_21555_DEVFN);

	dev = pci_get_bus_and_slot(0, IXDP2X00_21555_DEVFN);

	pci_remove_bus_device(dev);

	pci_dev_put(dev);

}



/**************************************************************************