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

Commit 33ae6ef2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

PCI Hotplug: make cpcihp driver use modern apis 



This removes the depandancy of the cpcihp driver from the PCI_LEGACY
config option by removing its usage of the pci_find_bus() function.


Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarScott Murray <scottm@somanetworks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 95247b57

drivers/pci/hotplug/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ config HOTPLUG_PCI_CPCI_ZT5550 


config HOTPLUG_PCI_CPCI_GENERIC

	tristate "Generic port I/O CompactPCI Hotplug driver"

	depends on HOTPLUG_PCI_CPCI && X86 && PCI_LEGACY

	depends on HOTPLUG_PCI_CPCI && X86

	help

	  Say Y here if you have a CompactPCI system card that exposes the #ENUM

	  hotswap signal as a bit in a system register that can be read through

drivers/pci/hotplug/cpcihp_generic.c

+7 −1
Original line number Diff line number Diff line
@@ -154,12 +154,18 @@ static int __init cpcihp_generic_init(void) 
	if(!r)

		return -EBUSY;



	dev = pci_find_slot(bridge_busnr, PCI_DEVFN(bridge_slot, 0));

	bus = pci_find_bus(0, bridge_busnr);

	if (!bus) {

		err("Invalid bus number %d", bridge_busnr);

		return -EINVAL;

	}

	dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0));

	if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {

		err("Invalid bridge device %s", bridge);

		return -EINVAL;

	}

	bus = dev->subordinate;

	pci_dev_put(dev);



	memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));

	generic_hpc_ops.query_enum = query_enum;