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

Commit e3265ea3 authored by Alex Chiang's avatar Alex Chiang Committed by Jesse Barnes
Browse files

PCI Hotplug: cpqphp: eliminate dead code - PCI_ScanBusNonBridge 



I have no clue what the original intent here was, but the code as
written is useless.

The old dbg() statement above the old callsite might lead one to think
that at one point, there was supposed to be some recursion, but any
sense of sanity here has been lost to the ravages of time.

Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent b019ee67

drivers/pci/hotplug/cpqphp_pci.c

+2 −12
Original line number Diff line number Diff line
@@ -193,16 +193,6 @@ int cpqhp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) 
}





/*

 * WTF??? This function isn't in the code, yet a function calls it, but the

 * compiler optimizes it away?  strange.  Here as a placeholder to keep the

 * compiler happy.

 */

static int PCI_ScanBusNonBridge (u8 bus, u8 device)

{

	return 0;

}



static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 * dev_num)

{

	u16 tdevice;
@@ -231,8 +221,8 @@ static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 * dev 
		/* Yep we got one. bridge ? */

		if ((work >> 8) == PCI_TO_PCI_BRIDGE_CLASS) {

			pci_bus_read_config_byte (ctrl->pci_bus, PCI_DEVFN(tdevice, 0), PCI_SECONDARY_BUS, &tbus);

			/* XXX: no recursion, wtf? */

			dbg("Recurse on bus_num %d tdevice %d\n", tbus, tdevice);

			if (PCI_ScanBusNonBridge(tbus, tdevice) == 0)

			return 0;

		}

	}