Commit 10c48093 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'topic/bjorn-remove-unused' into next 

* topic/bjorn-remove-unused:
  PCI/AER: use pci_is_pcie() instead of obsolete pci_dev.is_pcie
  PCI: remove pci_max_busnr() (was already commented out)
  PCI: remove pci_bus_find_ext_capability() (unused)
parents a187177a 505cf30b

drivers/pci/pci.c

+0 −67
Original line number Diff line number Diff line
@@ -136,30 +136,6 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) 
EXPORT_SYMBOL_GPL(pci_ioremap_bar);

#endif



#if 0

/**

 * pci_max_busnr - returns maximum PCI bus number

 *

 * Returns the highest PCI bus number present in the system global list of

 * PCI buses.

 */

unsigned char __devinit

pci_max_busnr(void)

{

	struct pci_bus *bus = NULL;

	unsigned char max, n;



	max = 0;

	while ((bus = pci_find_next_bus(bus)) != NULL) {

		n = pci_bus_max_busnr(bus);

		if(n > max)

			max = n;

	}

	return max;

}



#endif  /*  0  */



#define PCI_FIND_CAP_TTL	48



static int __pci_find_next_cap_ttl(struct pci_bus *bus, unsigned int devfn,
@@ -329,49 +305,6 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap) 
}

EXPORT_SYMBOL_GPL(pci_find_ext_capability);



/**

 * pci_bus_find_ext_capability - find an extended capability

 * @bus:   the PCI bus to query

 * @devfn: PCI device to query

 * @cap:   capability code

 *

 * Like pci_find_ext_capability() but works for pci devices that do not have a

 * pci_dev structure set up yet.

 *

 * Returns the address of the requested capability structure within the

 * device's PCI configuration space or 0 in case the device does not

 * support it.

 */

int pci_bus_find_ext_capability(struct pci_bus *bus, unsigned int devfn,

				int cap)

{

	u32 header;

	int ttl;

	int pos = PCI_CFG_SPACE_SIZE;



	/* minimum 8 bytes per capability */

	ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8;



	if (!pci_bus_read_config_dword(bus, devfn, pos, &header))

		return 0;

	if (header == 0xffffffff || header == 0)

		return 0;



	while (ttl-- > 0) {

		if (PCI_EXT_CAP_ID(header) == cap)

			return pos;



		pos = PCI_EXT_CAP_NEXT(header);

		if (pos < PCI_CFG_SPACE_SIZE)

			break;



		if (!pci_bus_read_config_dword(bus, devfn, pos, &header))

			break;

	}



	return 0;

}



static int __pci_find_next_ht_cap(struct pci_dev *dev, int pos, int ht_cap)

{

	int rc, ttl = PCI_FIND_CAP_TTL;

drivers/pci/pcie/aer/aerdrv_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int aer_hest_parse(struct acpi_hest_header *hest_hdr, void *data) 


	p = (struct acpi_hest_aer_common *)(hest_hdr + 1);

	if (p->flags & ACPI_HEST_GLOBAL) {

		if ((info->pci_dev->is_pcie &&

		if ((pci_is_pcie(info->pci_dev) &&

		     info->pci_dev->pcie_type == pcie_type) || bridge)

			ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);

	} else

include/linux/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -718,8 +718,6 @@ enum pci_lost_interrupt_reason pci_lost_interrupt(struct pci_dev *dev); 
int pci_find_capability(struct pci_dev *dev, int cap);

int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap);

int pci_find_ext_capability(struct pci_dev *dev, int cap);

int pci_bus_find_ext_capability(struct pci_bus *bus, unsigned int devfn,

				int cap);

int pci_find_ht_capability(struct pci_dev *dev, int ht_cap);

int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap);

struct pci_bus *pci_find_next_bus(const struct pci_bus *from);