Commit d3bac118 authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

PCI: Create __pci_bus_find_cap_start() from __pci_bus_find_cap() 



The current implementation of __pci_bus_find_cap() does two things,
first it determines the start of the capability chain for the device,
and then it trys to find the requested capability.

Split these out, so that we can use the two parts independantly in
a subsequent patch. Externally visible behaviour should be unchanged.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d86f90f9

drivers/pci/pci.c

+19 −9
Original line number Original line Diff line number Diff line
@@ -96,10 +96,10 @@ int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap) 
}

}

EXPORT_SYMBOL_GPL(pci_find_next_capability);

EXPORT_SYMBOL_GPL(pci_find_next_capability);





static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_type, int cap)

static int __pci_bus_find_cap_start(struct pci_bus *bus,

				    unsigned int devfn, u8 hdr_type)

{

{

	u16 status;

	u16 status;

	u8 pos;





	pci_bus_read_config_word(bus, devfn, PCI_STATUS, &status);

	pci_bus_read_config_word(bus, devfn, PCI_STATUS, &status);

	if (!(status & PCI_STATUS_CAP_LIST))

	if (!(status & PCI_STATUS_CAP_LIST))
@@ -108,15 +108,14 @@ static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_ty 
	switch (hdr_type) {

	switch (hdr_type) {

	case PCI_HEADER_TYPE_NORMAL:

	case PCI_HEADER_TYPE_NORMAL:

	case PCI_HEADER_TYPE_BRIDGE:

	case PCI_HEADER_TYPE_BRIDGE:

		pos = PCI_CAPABILITY_LIST;

		return PCI_CAPABILITY_LIST;

		break;

	case PCI_HEADER_TYPE_CARDBUS:

	case PCI_HEADER_TYPE_CARDBUS:

		pos = PCI_CB_CAPABILITY_LIST;

		return PCI_CB_CAPABILITY_LIST;

		break;

	default:

	default:

		return 0;

		return 0;

	}

	}

	return __pci_find_next_cap(bus, devfn, pos, cap);



	return 0;

}

}





/**

/**
@@ -140,7 +139,13 @@ static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_ty 
 */

 */

int pci_find_capability(struct pci_dev *dev, int cap)

int pci_find_capability(struct pci_dev *dev, int cap)

{

{

	return __pci_bus_find_cap(dev->bus, dev->devfn, dev->hdr_type, cap);

	int pos;



	pos = __pci_bus_find_cap_start(dev->bus, dev->devfn, dev->hdr_type);

	if (pos)

		pos = __pci_find_next_cap(dev->bus, dev->devfn, pos, cap);



	return pos;

}

}





/**

/**
@@ -158,11 +163,16 @@ int pci_find_capability(struct pci_dev *dev, int cap) 
 */

 */

int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap)

int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap)

{

{

	int pos;

	u8 hdr_type;

	u8 hdr_type;





	pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type);

	pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type);





	return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap);

	pos = __pci_bus_find_cap_start(bus, devfn, hdr_type & 0x7f);

	if (pos)

		pos = __pci_find_next_cap(bus, devfn, pos, cap);



	return pos;

}

}





/**

/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE