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

Commit 7c2dd2d7 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Bjorn Helgaas
Browse files

PCI: Remove unused ID-Based Ordering support 



My philosophy is unused code is dead code.  And dead code is subject to bit
rot and is a likely source of bugs.  Use it or lose it.

This reverts b48d4425 ("PCI: add ID-based ordering enable/disable
support"), removing these interfaces:

    pci_enable_ido()
    pci_disable_ido()

[bhelgaas: split to separate patch, also remove prototypes from pci.h]
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: Jesse Barnes <jbarnes@virtuousgeek.org>
parent ecc86356

drivers/pci/pci.c

+0 −40
Original line number Original line Diff line number Diff line
@@ -2110,46 +2110,6 @@ void pci_configure_ari(struct pci_dev *dev) 
	}

	}

}

}





/**

 * pci_enable_ido - enable ID-based Ordering on a device

 * @dev: the PCI device

 * @type: which types of IDO to enable

 *

 * Enable ID-based ordering on @dev.  @type can contain the bits

 * %PCI_EXP_IDO_REQUEST and/or %PCI_EXP_IDO_COMPLETION to indicate

 * which types of transactions are allowed to be re-ordered.

 */

void pci_enable_ido(struct pci_dev *dev, unsigned long type)

{

	u16 ctrl = 0;



	if (type & PCI_EXP_IDO_REQUEST)

		ctrl |= PCI_EXP_DEVCTL2_IDO_REQ_EN;

	if (type & PCI_EXP_IDO_COMPLETION)

		ctrl |= PCI_EXP_DEVCTL2_IDO_CMP_EN;

	if (ctrl)

		pcie_capability_set_word(dev, PCI_EXP_DEVCTL2, ctrl);

}

EXPORT_SYMBOL(pci_enable_ido);



/**

 * pci_disable_ido - disable ID-based ordering on a device

 * @dev: the PCI device

 * @type: which types of IDO to disable

 */

void pci_disable_ido(struct pci_dev *dev, unsigned long type)

{

	u16 ctrl = 0;



	if (type & PCI_EXP_IDO_REQUEST)

		ctrl |= PCI_EXP_DEVCTL2_IDO_REQ_EN;

	if (type & PCI_EXP_IDO_COMPLETION)

		ctrl |= PCI_EXP_DEVCTL2_IDO_CMP_EN;

	if (ctrl)

		pcie_capability_clear_word(dev, PCI_EXP_DEVCTL2, ctrl);

}

EXPORT_SYMBOL(pci_disable_ido);



static int pci_acs_enable;

static int pci_acs_enable;





/**

/**

include/linux/pci.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -997,11 +997,6 @@ static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, 
	return __pci_enable_wake(dev, state, false, enable);

	return __pci_enable_wake(dev, state, false, enable);

}

}





#define PCI_EXP_IDO_REQUEST	(1<<0)

#define PCI_EXP_IDO_COMPLETION	(1<<1)

void pci_enable_ido(struct pci_dev *dev, unsigned long type);

void pci_disable_ido(struct pci_dev *dev, unsigned long type);



/* For use by arch with custom probe code */

/* For use by arch with custom probe code */

void set_pcie_port_type(struct pci_dev *pdev);

void set_pcie_port_type(struct pci_dev *pdev);

void set_pcie_hotplug_bridge(struct pci_dev *pdev);

void set_pcie_hotplug_bridge(struct pci_dev *pdev);
@@ -1412,14 +1407,6 @@ static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, 
	return 0;

	return 0;

}

}





static inline void pci_enable_ido(struct pci_dev *dev, unsigned long type)

{

}



static inline void pci_disable_ido(struct pci_dev *dev, unsigned long type)

{

}



static inline int pci_request_regions(struct pci_dev *dev, const char *res_name)

static inline int pci_request_regions(struct pci_dev *dev, const char *res_name)

{

{

	return -EIO;

	return -EIO;